From 827987d2018ce1a48697b10c039c3cf2ec0d1a19 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Fri, 23 Dec 2022 00:07:02 +0100
Subject: cleanup

---
 sshtool | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'sshtool')

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%.*}
 
-- 
cgit v1.2.3