diff options
Diffstat (limited to 'lib/subcommands')
| -rw-r--r-- | lib/subcommands/add.bash | 6 | ||||
| -rw-r--r-- | lib/subcommands/del.bash | 6 | ||||
| -rw-r--r-- | lib/subcommands/sync.bash | 4 |
3 files changed, 11 insertions, 5 deletions
diff --git a/lib/subcommands/add.bash b/lib/subcommands/add.bash index 644c04f..db3ec40 100644 --- a/lib/subcommands/add.bash +++ b/lib/subcommands/add.bash @@ -8,6 +8,8 @@ subcommand() { local buffer local missing_vars=0 + local playbook_base + local playbook_registry export BASHTARD_PLAYBOOK="$1" ; shift @@ -17,8 +19,8 @@ subcommand() return 2 fi - local playbook_base="$(playbook_path "base")" - local playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}" + playbook_base="$(playbook_path "base")" + playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}" # Make sure we only run add if the playbook is not in the registry yet if grep -Fqx "$BASHTARD_PLAYBOOK" "$playbook_registry" diff --git a/lib/subcommands/del.bash b/lib/subcommands/del.bash index 38d675c..ec2ec80 100644 --- a/lib/subcommands/del.bash +++ b/lib/subcommands/del.bash @@ -7,6 +7,8 @@ subcommand() { local buffer + local playbook_base + local playbook_registry export BASHTARD_PLAYBOOK="$1" ; shift @@ -16,8 +18,8 @@ subcommand() return fi - local playbook_base="$(playbook_path "base")" - local playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}" + playbook_base="$(playbook_path "base")" + playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}" # Make sure we only run add if the playbook is not in the registry yet if ! grep -Fqx "$BASHTARD_PLAYBOOK" "$playbook_registry" diff --git a/lib/subcommands/sync.bash b/lib/subcommands/sync.bash index 6bda162..8d437f6 100644 --- a/lib/subcommands/sync.bash +++ b/lib/subcommands/sync.bash @@ -28,9 +28,11 @@ subcommand() sync_playbook() { - local playbook_base="$(playbook_path "base")" + local playbook_base local missing_vars=0 + playbook_base="$(playbook_path "base")" + notice "bashtard/sync" "Running sync for $BASHTARD_PLAYBOOK" if [[ ! -d "$playbook_base" ]] |