From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 3 Mar 2025 04:30:53 +0000 (+0100)
Subject: Further script fixes.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/static/%7B%7Bprefix%7D%7D/template?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=config

Further script fixes.
---

diff --git a/constants.sh b/constants.sh
index 143793d..29380d0 100755
--- a/constants.sh
+++ b/constants.sh
@@ -13,7 +13,7 @@ PATH_MANY_MISC="${PATH_MANY}/scripts/_misc.sh"
 USERNAME="plom"
 PATH_USER_HOME="/home/${USERNAME}"
 
-FILENAME_PRIVATE_KEY='id_rsa.pub'
+FILENAME_PRIVATE_KEY='id_rsa'
 FILENAME_PUBLIC_KEY="${FILENAME_PRIVATE_KEY}.pub"
 URL_PUBLIC_KEY="https://dump.plomlompom.com/dump/${FILENAME_PUBLIC_KEY}"
 PATH_REL_LOCAL_SSH=".ssh"
diff --git a/testing/aptmark/user b/testing/aptmark/user
index f1176e5..5557251 100644
--- a/testing/aptmark/user
+++ b/testing/aptmark/user
@@ -1,3 +1,5 @@
+# for secrets
+pmount
 # generally useful
 ack
 vim
diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index cc7086d..f8e25aa 100755
--- a/testing/scripts/setup_secrets.sh
+++ b/testing/scripts/setup_secrets.sh
@@ -58,7 +58,7 @@ echo "Setting up .ssh"
 PATH_PRIVATE_KEY=${PATH_USER_SSH}/${FILENAME_PRIVATE_KEY}
 PATH_PUBLIC_KEY=${PATH_USER_SSH}/${FILENAME_PUBLIC_KEY}
 su -lc "mkdir -p ${PATH_USER_SSH} && cp ${PATH_SECRETS}/${FILENAME_PRIVATE_KEY} ${PATH_PRIVATE_KEY}" plom
-while [ ! -e "${PATH_PUBLIC_KEY}" ]; do
+while [ ! -s "${PATH_PUBLIC_KEY}" ]; do
     set +e
     su -lc "ssh-keygen -y -f ${PATH_PRIVATE_KEY} > ${PATH_PUBLIC_KEY}" plom
     set -e