From 0596dec504fbe6702626c19f635f8a9f4f538085 Mon Sep 17 00:00:00 2001
From: Florian Pritz <bluewind@xinu.at>
Date: Mon, 18 Jul 2016 11:17:08 +0200
Subject: [PATCH] Switch to more general wrapper script for running playbooks
 and vault

Signed-off-by: Florian Pritz <bluewind@xinu.at>
---
 ansible-command-wrapper | 15 +++++++++++++++
 ansible-playbook        |  4 +---
 ansible-vault           |  4 +---
 3 files changed, 17 insertions(+), 6 deletions(-)
 create mode 100755 ansible-command-wrapper
 mode change 100755 => 120000 ansible-playbook
 mode change 100755 => 120000 ansible-vault

diff --git a/ansible-command-wrapper b/ansible-command-wrapper
new file mode 100755
index 000000000..80663fc0f
--- /dev/null
+++ b/ansible-command-wrapper
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+command=$(basename "$0")
+
+if [[ $command = "ansible-command-wrapper" ]]; then
+	if [[ $# -gt 0 ]]; then
+		command=$1
+		shift
+	else
+		echo "usage: ansible-command-wrapper <command name> [arguments]" >&2
+		exit 1
+	fi
+fi
+
+exec "$command" --vault-password-file $(dirname $0)/misc/get-vault-pass.sh "$@"
diff --git a/ansible-playbook b/ansible-playbook
deleted file mode 100755
index c98ae3d02..000000000
--- a/ansible-playbook
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec ansible-playbook --vault-password-file $(dirname $0)/misc/get-vault-pass.sh "$@"
diff --git a/ansible-playbook b/ansible-playbook
new file mode 120000
index 000000000..e4e1b37cb
--- /dev/null
+++ b/ansible-playbook
@@ -0,0 +1 @@
+ansible-command-wrapper
\ No newline at end of file
diff --git a/ansible-vault b/ansible-vault
deleted file mode 100755
index 6c1ab048e..000000000
--- a/ansible-vault
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec ansible-vault --vault-password-file $(dirname $0)/misc/get-vault-pass.sh "$@"
diff --git a/ansible-vault b/ansible-vault
new file mode 120000
index 000000000..e4e1b37cb
--- /dev/null
+++ b/ansible-vault
@@ -0,0 +1 @@
+ansible-command-wrapper
\ No newline at end of file
-- 
GitLab