Further script fixes.

diff --git a/constants.sh b/constants.sh
index 143793d738af4ba9ca9065c31f74d4736824e4b0..29380d0f15fa1c7624d97b8362d7ec72e6135e79 100755 (executable)
--- 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}"
 
 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"
 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 f1176e552ce73c603158b1419d0d33731cec4251..5557251f194b42ccde7d5d6abe26819ba84c0817 100644 (file)
--- a/testing/aptmark/user
+++ b/testing/aptmark/user
@@ -1,3 +1,5 @@
+# for secrets
+pmount

 # generally useful
 ack
 vim
 # generally useful
 ack
 vim

diff --git a/testing/scripts/setup_secrets.sh b/testing/scripts/setup_secrets.sh
index cc7086d2450773dffa8fb2b0e1cf5ccd31134a4f..f8e25aa6373f9e1c854e4170b519dfb5ebbd6aa3 100755 (executable)
--- 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
 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
     set +e
     su -lc "ssh-keygen -y -f ${PATH_PRIVATE_KEY} > ${PATH_PUBLIC_KEY}" plom
     set -e