cleanup

1 files changed, 15 insertions, 2 deletions

diff --git a/sshtool b/sshtool
index 8719ffa..262f0e3 100755
--- a/sshtool
+++ b/sshtool
@@ -1,10 +1,11 @@
 #!/usr/bin/env bash
 
-cd $(dirname $0)
-
 CMDFILE="$1"
 shift 1
 
+cd $(dirname $CMDFILE)
+CMDFILE=./$(basename $CMDFILE)
+
 CLUSTER="$1"
 if [ -z "$CLUSTER" ] || [ ! -d "cluster/$CLUSTER" ]; then
 	echo "Usage: $CMDFILE <cluster name>"
@@ -36,6 +37,7 @@ EOG
 chmod +x /tmp/deploytool_askpass
 export SUDO_ASKPASS=/tmp/deploytool_askpass
 sudo -A sh - <<'EOEVERYTHING'
+set -e
 EOF
 }
 
@@ -97,6 +99,17 @@ chmod 0600 $TO
 EOF
 }
 
+function pipe_pass {
+	local PASSKEY=$1
+	local CMD=$2
+	cat <<EOF
+echo '- pipe secret $PASSKEY to command $CMD'
+base64 -d <<EOG | $CMD > /dev/null
+$(pass $PASSKEY | base64)
+EOG
+EOF
+}
+
 for NIXHOST in $NIXHOSTLIST; do
 	NIXHOST=${NIXHOST%.*}