Fix.

diff --git a/bookworm/scripts/lib/apt_get_edited b/bookworm/scripts/lib/apt_get_edited
index f8e948f63b82c655deaa9f585839e65803205448..002056fd145ac710be5adb66848116d2b6abc16b 100644 (file)
--- a/bookworm/scripts/lib/apt_get_edited
+++ b/bookworm/scripts/lib/apt_get_edited
@@ -73,7 +73,7 @@ DEBIAN_FRONTEND=noninteractive apt-get -y $1 2>&1 | while read _LINE; do
         if [ ! -z "${_LAST_PREFIX}" ]; then
             echo ''
         fi
         if [ ! -z "${_LAST_PREFIX}" ]; then
             echo ''
         fi

-        echo "\r  ${_LINE}"
+        echo "\r${_LINE}"

         _LAST_PREFIX=''
     fi
 done
         _LAST_PREFIX=''
     fi
 done

diff --git a/bookworm/scripts/lib/check_finished_marker b/bookworm/scripts/lib/check_finished_marker
index c6259568cd7141ca9511e8f3d5d88896862cbeec..38b806e891ef5929e3989ca6b2f684d8e30c46b7 100644 (file)
--- a/bookworm/scripts/lib/check_finished_marker
+++ b/bookworm/scripts/lib/check_finished_marker
@@ -3,6 +3,6 @@
 check_finished_marker() {
     _PATH_MARKER="${PATH_ROOT_FINISHEDS}/$1"
     if [ ! -f "${_PATH_MARKER}" ]; then
 check_finished_marker() {
     _PATH_MARKER="${PATH_ROOT_FINISHEDS}/$1"
     if [ ! -f "${_PATH_MARKER}" ]; then

-        abort "Missing dependency, did not find marker: ${_PATH_MARKER}" 
+        abort "# Missing dependency, did not find marker: ${_PATH_MARKER}"

     fi
 }
     fi
 }

diff --git a/bookworm/scripts/lib/install_tags b/bookworm/scripts/lib/install_tags
index 8cd5c3e0f57291200470cb4ab33835ef7bee5010..d3e87c45b168985e71a70783f0a55e848aae138d 100644 (file)
--- a/bookworm/scripts/lib/install_tags
+++ b/bookworm/scripts/lib/install_tags
@@ -3,7 +3,7 @@
 
 install_tags() {
     _INSTALL_TAGS="$@"
 
 install_tags() {
     _INSTALL_TAGS="$@"

-    echo "Installing packages and files for: ${_INSTALL_TAGS}"
+    echo "# Installing packages and files for: ${_INSTALL_TAGS}"

     ensure_packages_of_tags ${_INSTALL_TAGS}
     copy_dirtrees_of_tags ${_INSTALL_TAGS}
 }
     ensure_packages_of_tags ${_INSTALL_TAGS}
     copy_dirtrees_of_tags ${_INSTALL_TAGS}
 }

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index e3aff7f6082c38a7afcdb2697dce44a98c557b0b..ad62e3491949d42e0be7dd3432da706f1b1e1d63 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -24,7 +24,7 @@ PATH_DUMP='/var/www/dump'
 echo -n '# Determining external IP …'
 for _CANDIDATE in $(hostname -I); do
     _START=$(echo ${_CANDIDATE} | cut -d'.' -f1)
 echo -n '# Determining external IP …'
 for _CANDIDATE in $(hostname -I); do
     _START=$(echo ${_CANDIDATE} | cut -d'.' -f1)

-    if [ "$(echo -n ${_START} | wc -c)" -gt 3 ]; then
+    if [ "$(echo -n ${_START} | wc -c)" -gt 3 ]; then  # ignore IPv6

         continue
     fi 
     if [ "${_START}" = "127" -o "${_START}" = "192" -o "${_START}" = "172" ]; then
         continue
     fi 
     if [ "${_START}" = "127" -o "${_START}" = "192" -o "${_START}" = "172" ]; then