Fix.

diff --git a/bookworm/scripts/lib/apt_get_digested b/bookworm/scripts/lib/apt_get_digested
index 5061ec9da19882b711cd1b853e4c636638f1acfb..3ff37c81ff15c763441d8a2d468ffe0530aa2b69 100644 (file)
--- a/bookworm/scripts/lib/apt_get_digested
+++ b/bookworm/scripts/lib/apt_get_digested
@@ -27,7 +27,7 @@ Setting up:|Setting up ([[:print:]]+) \([[:print:]]+\) \.\.\.|\1
 Updating to current default:|Updating ([[:print:]]+) to current default.|\1
 disabled or static unit, so not starting:|([[:print:]]+) is a disabled or a static unit, not starting it\.|\1
 disabled or static unit not running, so not starting:|([[:print:]]+) is a disabled or a static unit not running, not starting it\.|\1
-BECOME_NEXT_PREFIX|dpkg: ([[:print:]]+): dependency problems, but removing anyway as you requested:|dpkg warns: despite dependency problems, removing \1 – dependencies:
+BECOME_NEXT_PREFIX|dpkg: ([[:print:]]+): dependency problems, but removing anyway as you requested:|dpkg warns: removing \1 despite dependency problems:
 dpkg warns: unable to delete old directories (not empty):|dpkg: warning: unable to delete old directory '"'"'([[:print:]]+)'"'"': Directory not empty|\1
 update-alternatives: providing in auto mode:|update-alternatives: using ([[:print:]]+) to provide ([[:print:]]+) \(([[:print:]]+)\) in auto mode| [\1 → \2 (\3)]'
 

diff --git a/bookworm/scripts/setup_server.sh b/bookworm/scripts/setup_server.sh
index b17335ee3425f853b766ba46d9193fd3fd527b72..24caecb3aaade4784bb3c4bec6c420b46cfb7159 100755 (executable)
--- a/bookworm/scripts/setup_server.sh
+++ b/bookworm/scripts/setup_server.sh
@@ -1,7 +1,6 @@
 #!/bin/sh
 set -e
 cd $(dirname "$0")
-. lib/abort_if_command_unknown
 . lib/constants_etc  # PATH_ETC
 . lib/constants_ssh  # PATH_REL_SSH, PATH_USER_SSH
 . lib/copy_dirtrees_of_tags
@@ -16,7 +15,6 @@ prefixed_msg 'starting (setting up basics of standard server)'
 
 INSTALL_TAGS='all server user keep_if_installed:systemd-resolved'
 
-abort_if_command_unknown gpg
 expect_n_args 2 3 'CADDY_PASSWORD, HOSTNAME, [FQDN]' $@
 CADDY_PASSWORD="$1"
 HOSTNAME="$2"
@@ -49,8 +47,8 @@ if [ ! -z "${FQDN}" ]; then
     fi
 fi
 
-prefixed_msg 'Ensure we have curl (for caddy installation preparation) …'
-apt-get -y install curl > /dev/null
+prefixed_msg 'Ensure we have curl and gpg (for caddy installation preparation) …'
+apt-get -y install curl gpg > /dev/null
 PATH_CURL_ERROR="$(path_tmp_timestamped curl_error)"
 prefixed_msg 'Retrieve caddy repo key …'
 set +e

diff --git a/trixie/scripts/lib/install_tags b/trixie/scripts/lib/install_tags
new file mode 120000 (symlink)
index 0000000..e205175
--- /dev/null
+++ b/trixie/scripts/lib/install_tags
@@ -0,0 +1 @@
+../../../bookworm/scripts/lib/install_tags
\ No newline at end of file