diff options
-rwxr-xr-x | apply-role.sh | 5 | ||||
-rwxr-xr-x | install.sh | 8 | ||||
-rwxr-xr-x | vault.sh | 5 |
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 @@ -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 @@ -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%%/*} |