aboutsummaryrefslogtreecommitdiff
path: root/lib/subcommands
diff options
context:
space:
mode:
authorPatrick Spek <p.spek@tyil.nl>2023-03-10 10:44:48 +0100
committerPatrick Spek <p.spek@tyil.nl>2023-03-10 10:44:48 +0100
commit28c55aa1a8c82def2ffdb3e000812a5523371ac5 (patch)
tree35bf0c53822a6bc1d54d43e7948c5951f72d5d6d /lib/subcommands
parent7b4d5e80ab5bf5d29b38dc617317024373ae1fd0 (diff)
Add playbook_path()
Diffstat (limited to 'lib/subcommands')
-rw-r--r--lib/subcommands/add.bash2
-rw-r--r--lib/subcommands/del.bash2
-rw-r--r--lib/subcommands/sync.bash2
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/subcommands/add.bash b/lib/subcommands/add.bash
index 8df2e49..644c04f 100644
--- a/lib/subcommands/add.bash
+++ b/lib/subcommands/add.bash
@@ -17,7 +17,7 @@ subcommand()
return 2
fi
- local playbook_base="$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK"
+ local playbook_base="$(playbook_path "base")"
local playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}"
# Make sure we only run add if the playbook is not in the registry yet
diff --git a/lib/subcommands/del.bash b/lib/subcommands/del.bash
index c09c501..38d675c 100644
--- a/lib/subcommands/del.bash
+++ b/lib/subcommands/del.bash
@@ -16,7 +16,7 @@ subcommand()
return
fi
- local playbook_base="$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK"
+ local playbook_base="$(playbook_path "base")"
local playbook_registry="$BASHTARD_ETCDIR/registry.d/${BASHTARD_PLATFORM[fqdn]}"
# Make sure we only run add if the playbook is not in the registry yet
diff --git a/lib/subcommands/sync.bash b/lib/subcommands/sync.bash
index 8f5e2cd..6bda162 100644
--- a/lib/subcommands/sync.bash
+++ b/lib/subcommands/sync.bash
@@ -28,7 +28,7 @@ subcommand()
sync_playbook()
{
- local playbook_base="$BASHTARD_ETCDIR/playbooks.d/$BASHTARD_PLAYBOOK"
+ local playbook_base="$(playbook_path "base")"
local missing_vars=0
notice "bashtard/sync" "Running sync for $BASHTARD_PLAYBOOK"