From 33a8c6ba23cdc2e654deadafe81197cc08b30c4a Mon Sep 17 00:00:00 2001 From: Christian Heller Date: Tue, 15 Apr 2025 13:40:42 +0200 Subject: [PATCH] Fix. --- bookworm/home/catgirl/.plomlib/constants_catgirl | 5 +---- bookworm/scripts/lib/constants_catgirl | 4 ++++ testing/scripts/init_server_access.sh | 7 ++++++- 3 files changed, 11 insertions(+), 5 deletions(-) mode change 100644 => 120000 bookworm/home/catgirl/.plomlib/constants_catgirl create mode 100644 bookworm/scripts/lib/constants_catgirl diff --git a/bookworm/home/catgirl/.plomlib/constants_catgirl b/bookworm/home/catgirl/.plomlib/constants_catgirl deleted file mode 100644 index daa6b56..0000000 --- a/bookworm/home/catgirl/.plomlib/constants_catgirl +++ /dev/null @@ -1,4 +0,0 @@ -. lib/constants_user # PATH_USER_HOME - -PATH_USER_SHARE_CATGIRL="${PATH_USER_HOME}/.local/share/catgirl" - diff --git a/bookworm/home/catgirl/.plomlib/constants_catgirl b/bookworm/home/catgirl/.plomlib/constants_catgirl new file mode 120000 index 0000000..cc7e3bf --- /dev/null +++ b/bookworm/home/catgirl/.plomlib/constants_catgirl @@ -0,0 +1 @@ +../../../scripts/lib/constants_catgirl \ No newline at end of file diff --git a/bookworm/scripts/lib/constants_catgirl b/bookworm/scripts/lib/constants_catgirl new file mode 100644 index 0000000..daa6b56 --- /dev/null +++ b/bookworm/scripts/lib/constants_catgirl @@ -0,0 +1,4 @@ +. lib/constants_user # PATH_USER_HOME + +PATH_USER_SHARE_CATGIRL="${PATH_USER_HOME}/.local/share/catgirl" + diff --git a/testing/scripts/init_server_access.sh b/testing/scripts/init_server_access.sh index 7819d84..90a3a4c 100755 --- a/testing/scripts/init_server_access.sh +++ b/testing/scripts/init_server_access.sh @@ -13,8 +13,13 @@ SERVER="$1" echo '\nKnow host.\n' set +e ssh-keygen -f "${PATH_KNOWN_HOSTS}" -R "${SERVER}" -set -e ssh-keyscan "${SERVER}" >> "${PATH_KNOWN_HOSTS}" +RESULT=$? +echo "DEBUG (why does script sometimes stop here if 'set -e' a bit earlier?): ${RESULT}" +if [ "${RESULT}" != "0" ]; then + exit 1 +fi +set -e echo '\nAsking for new root password.\n' stty -echo -- 2.30.2