From d99483ccf4fa82989355c2551873399f76df4466 Mon Sep 17 00:00:00 2001
From: Christian Heller <c.heller@plomlompom.de>
Date: Mon, 3 Mar 2025 05:30:53 +0100
Subject: [PATCH] Further script fixes.
---
constants.sh | 2 +-
testing/aptmark/user | 2 ++
testing/scripts/setup_secrets.sh | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
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
--
2.30.2