summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xapply-role.sh5
-rwxr-xr-xinstall.sh8
-rwxr-xr-xvault.sh5
3 files changed, 7 insertions, 11 deletions
diff --git a/apply-role.sh b/apply-role.sh
index 708a8357..0a513b1d 100755
--- a/apply-role.sh
+++ b/apply-role.sh
@@ -5,9 +5,8 @@ if [ -z "$1" ] || [ -z "$2" ]; then
exit 1
fi
hosts="$1"
-shift
-role="$1"
-shift
+role="$2"
+shift 2
cd "${BASH_SOURCE%/*}"
source common/utils.sh
diff --git a/install.sh b/install.sh
index b4f2c187..764f23bc 100755
--- a/install.sh
+++ b/install.sh
@@ -5,11 +5,9 @@ if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
exit 1
fi
name=$1
-shift
-distro=$1
-shift
-codename=$1
-shift
+distro=$2
+codename=$3
+shift 3
cd "${BASH_SOURCE%/*}"
source common/utils.sh
diff --git a/vault.sh b/vault.sh
index 1dd48155..e44bff92 100755
--- a/vault.sh
+++ b/vault.sh
@@ -5,9 +5,8 @@ if [ -z "$1" ] || [ -z "$2" ]; then
exit 1
fi
command="$1"
-shift
-file="$1"
-shift
+file="$2"
+shift 2
file=$(realpath --relative-to "${BASH_SOURCE%/*}" "$file")
env_group=${file%%/*}