From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 17 Apr 2025 21:18:35 +0000 (+0200)
Subject: Fix.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bprefix%7D%7D/%22https:/validator.w3.org/conditions?a=commitdiff_plain;h=a1d02853a96c221d6febcf0fcc17806185e7c692;p=config

Fix.
---

diff --git a/testing/scripts/init_server_access.sh b/testing/scripts/init_server_access.sh
index 54332b6..7b6fefa 100755
--- a/testing/scripts/init_server_access.sh
+++ b/testing/scripts/init_server_access.sh
@@ -2,11 +2,11 @@
 set -e
 cd $(dirname "$0")
 . lib/constants_ssh  # PATH_USER_SSH
-. lib/expect_min_n_args
+. lib/expect_n_args
 
 PATH_KNOWN_HOSTS="${PATH_USER_SSH}/known_hosts"
 
-expect_min_n_args 1 '(server)' "$@"
+expect_n_args 1 1 '(server)' $@
 SERVER="$1"
 
 echo '\nKnow host.\n'
diff --git a/testing/scripts/lib/expect_min_n_args b/testing/scripts/lib/expect_min_n_args
deleted file mode 100644
index 8f9c74d..0000000
--- a/testing/scripts/lib/expect_min_n_args
+++ /dev/null
@@ -1,9 +0,0 @@
-expect_min_n_args() {
-    MIN_ARGS="$1"
-    EXPLAINER="$2"
-    shift 2
-    if [ "$#" -lt "${MIN_ARGS}" ]; then
-        echo "Need at least ${MIN_ARGS} arguments … ${EXPLAINER}"
-        false
-    fi
-}
diff --git a/testing/scripts/lib/mount_secrets b/testing/scripts/lib/mount_secrets
index b49c559..8b609b6 100644
--- a/testing/scripts/lib/mount_secrets
+++ b/testing/scripts/lib/mount_secrets
@@ -1,11 +1,11 @@
 . lib/constants_secrets  # PATH_MEDIA, PATH_REL_SECRETS
-. lib/expect_min_n_args
+. lib/expect_n_args
 . lib/get_passphrase
 . lib/path_tmp_timestamped
 . lib/retry_until
 
 mount_secrets() {
-    expect_min_n_args 1 "(device name, e.g. 'sda')" "$@"
+    expect_n_n_args 1 1 "(device name, e.g. 'sda')" $@
     SECRETS_DEV=$1
     if [ -z "${SECRETS_DEV}" ]; then
         abort "Aborting due to empty device argument."