Merge pull request 'abra-commands.sh → abra.sh, make configs type-level' (#77) from move-configs into main

Reviewed-on: coop-cloud/abra#77
This commit is contained in:
decentral1se 2021-02-09 08:31:45 +01:00
commit 156d5d8fba
2 changed files with 9 additions and 10 deletions

View File

@ -19,6 +19,7 @@
- Use `# length=x` comments to generate passwords with `pwgen` and drop `KEY`/`PASSWORD` logic ([#68](https://git.autonomic.zone/coop-cloud/abra/issues/68))
- Global `--skip-update|-U` / `--skip-check|-C` options to make things quicker ([37e8b00](https://git.autonomic.zone/coop-cloud/abra/commit/37e8b00))
- `app backup` and `app restore` commands; requires per-app definition ([#70](https://git.autonomic.zone/coop-cloud/abra/issues/70))
- Rename per-type `abra-commands.sh` to `abra.sh`, and include config versions as type-level instead of app-level config ([#43](https://git.autonomic.zone/coop-cloud/abra/issues/43))
# abra 0.4.1 (2020-12-24)

18
abra
View File

@ -391,8 +391,6 @@ require_app_latest() {
if [ "$abra___skip_update" = "false" ]; then
(cd "$APP_DIR" && git pull > /dev/null 2>&1)
else
info "Skipping \`git pull\`"
fi
}
@ -403,11 +401,11 @@ fi
###### Run-time loading
load_custom_commands() {
if [ -f abra-commands.sh ]; then
load_abra_sh() {
if [ -f abra.sh ]; then
# shellcheck disable=SC1091
source abra-commands.sh
info "Loading custom commands from abra-commands.sh"
source abra.sh
info "Loading abra.sh"
fi
if [ -n "$abra__app_" ]; then
@ -416,10 +414,10 @@ load_custom_commands() {
require_app_latest "$TYPE"
fi
if [ -f "$APP_DIR/abra-commands.sh" ]; then
info "Loading custom commands from $APP_DIR/abra-commands.sh"
if [ -f "$APP_DIR/abra.sh" ]; then
info "Loading $APP_DIR/abra.sh"
# shellcheck disable=SC1090,SC1091
source "$APP_DIR/abra-commands.sh"
source "$APP_DIR/abra.sh"
fi
}
@ -1488,7 +1486,7 @@ abra() {
set +a
fi
load_custom_commands
load_abra_sh
# Search for sub_* functions, and check if any of them matches enabled
# arguments (i.e. is a command and is specified)