Fix.

diff --git a/bookworm/scripts/lib/copy_dirtree b/bookworm/scripts/lib/copy_dirtree
index 7a3a1732a124f5b8a6c5e3110b0c6f47c9d16761..f0d5c1f6f43a16f63c50d465990ef2bc24bfdaa8 100644 (file)
--- a/bookworm/scripts/lib/copy_dirtree
+++ b/bookworm/scripts/lib/copy_dirtree
@@ -2,7 +2,7 @@
 . lib/mkdir_p_for_user
 
 copy_dirtree() {
-    expect_n_args 4 99 'OWNER_TO_ENFORCE (to ignore, pass empty string) SOURCE_ROOT TARGET_ROOT TAG...' $@
+    expect_n_args 4 99 'OWNER_TO_ENFORCE (to ignore, use "-") SOURCE_ROOT TARGET_ROOT TAG...' $@
     _OWNER="$1"
     _SOURCE_ROOT="$2"
     _TARGET_ROOT="$3"
@@ -18,11 +18,11 @@ copy_dirtree() {
             _PATH_TARGET="${_TARGET_ROOT}"$(echo "${_PATH_REL}" | cut -c 2-)
             _PATH_SOURCE=$(realpath "${_PATH_REL}")
             _DIRECTORY=$(dirname "${_PATH_TARGET}")
-            if [ ! -z "${_OWNER}" ]; then
+            if [ -z "${_OWNER}" = '-' ]; then
                 mkdir_p_for_user "${_OWNER}" "${_DIRECTORY}"
             fi
             cp -av "${_PATH_SOURCE}" "${_PATH_TARGET}"
-            if [ ! -z "${_OWNER}" ]; then
+            if [ -z "${_OWNER}" '-' ]; then
                 chown "${_OWNER}:${_OWNER}" "${_PATH_TARGET}"
             fi
         done

diff --git a/bookworm/scripts/lib/ensure_etc_of_tags b/bookworm/scripts/lib/ensure_etc_of_tags
index 410a6770c1e742ad5e97fcfbef37f2644cefe22c..9d590a89d5864d712f1771ca074acfc60e546d46 100644 (file)
--- a/bookworm/scripts/lib/ensure_etc_of_tags
+++ b/bookworm/scripts/lib/ensure_etc_of_tags
@@ -4,5 +4,5 @@
 
 ensure_etc_of_tags() {
     _PATH_CONF_ETC="${PATH_CONF}/${PATH_REL_ETC}"
-    copy_dirtree '' "${_PATH_CONF_ETC}" "${PATH_ETC}" $@
+    copy_dirtree '-' "${_PATH_CONF_ETC}" "${PATH_ETC}" $@
 }

diff --git a/bookworm/scripts/lib/expect_n_args b/bookworm/scripts/lib/expect_n_args
index 950671ad59cbb1e0badf304e206844066c59e569..54f98b82a411eacbd34c526b70c0ff12da76a126 100644 (file)
--- a/bookworm/scripts/lib/expect_n_args
+++ b/bookworm/scripts/lib/expect_n_args
@@ -7,7 +7,7 @@ expect_n_args() {
     shift 3
     _ABORT_MSG=
     if [ "$#" -lt "${_N_MIN_ARGS}" ]; then
-        _ABORT_MSG="missing arguments (got $# instead of ${_N_MAX_ARGS})."
+        _ABORT_MSG="missing arguments (got $# instead of ${_N_MIN_ARGS})."
     elif [ "$#" -gt "${_N_MAX_ARGS}" ]; then
         shift "${_N_MAX_ARGS}"
         _ABORT_MSG="unexpected arguments beyond expected number (${_N_MAX_ARGS}): $@"

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index 421068bde19abd7d654a51a5c0c2bd98eca74530..ddfdcb179ed7324d9b35de0b1f574b0c91fa05df 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -59,8 +59,8 @@ systemctl enable --now nftables
 
 echo "Adapting caddy's config and reloading it …"
 HASH=$(caddy hash-password --plaintext "${WEB_PASSWORD}")
-sed -i "s/REPLACE_WITH_HASH/${HASH}/g" "${PATH_CADDYFILE}"
-sed -i "s/REPLACE_WITH_FQDN/${FQDN}/g" "${PATH_CADDYFILE}"
+sed -i 's/REPLACE_WITH_HASH/'"${HASH}"'/g' "${PATH_CADDYFILE}"
+sed -i 's/REPLACE_WITH_FQDN/'"${FQDN}"'/g' "${PATH_CADDYFILE}"
 mkdir -p /var/www/dump/private /var/www/dump/public
 systemctl reload caddy