Fix.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index e0aa77e297cdefcaa83a0da3ba5de9f2644cce53..a02ab310855ae82b2c7c706532af2ed31ec58b81 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -55,13 +55,16 @@ error_exit_with_usage() {
 }
 
 # commands
-COMMANDS='claim help keys orgpull'
+COMMANDS='backup_keys claim help keys orgpull'
 
-_check_args_beyond() {
+_check_args_n() {
     _N_MAX_ARGS="$1"
+    if [ "$#" -lt "${_N_MAX_ARGS}" ]; then
+        error_exit "missing arguments ($# instead of ${_N_MAX_ARGS}."
+    fi
     shift $(calc "${_N_MAX_ARGS} + 1" | cut -f2)
     if [ "$#" -gt 0 ]; then
-        _MSG="unexpected arguments beyond command: $@"
+        _MSG="unexpected arguments beyond expected number: $@"
         error_exit "${_MSG}"
     fi
 }
@@ -71,7 +74,7 @@ _id_from_file() { head -1 "$1" | cut -d' ' -f2; }
 HELP_ARGS_backup_keys=' PATH'
 HELP_DESC_backup_keys="copy known keys to PATH/, with their repos' server names as filenames"
 CMDFNC_backup_keys() {
-    _check_args_beyond 1 "$@"
+    _check_args_n 1 "$@"
     _PATH_TARGET_DIR="$1"
     if [ -e "${_PATH_TARGET_DIR}"] && [ ! -d "${_PATH_TARGET_DIR}" ]; then
         error_exit "non-directory at ${_PATH_TARGET_DIR}"
@@ -96,7 +99,7 @@ CMDFNC_backup_keys() {
 HELP_ARGS_claim=' PATH'
 HELP_DESC_claim="register file of PATH as key to repo at \"$(servername_to_location SERVERNAME)\", with SERVERNAME the filename portion of PATH"
 CMDFNC_claim() {
-    _check_args_beyond 1 "$@"
+    _check_args_n 1 "$@"
     _PATH_SOURCE="$1"
     _ensure_no_overwrite_at() {
         if [ -f "$1" ]; then
@@ -127,13 +130,13 @@ CMDFNC_claim() {
 
 HELP_DESC_help='print this help and exit'
 CMDFNC_help() {
-    _check_args_beyond 0 "$@"
+    _check_args_n 0 "$@"
     _print_usage
 }
 
 HELP_DESC_keys='list known repos in ID, key filename, and alleged location'
 CMDFNC_keys() {
-    _check_args_beyond 0 "$@"
+    _check_args_n 0 "$@"
     _exit_ok() {
        echo "(none, since directory ${1})"
        exit 0
@@ -161,7 +164,7 @@ CMDFNC_keys() {
 
 HELP_DESC_orgpull='pull most recent org directory available in repos'
 CMDFNC_orgpull() {
-    _check_args_beyond 0 "$@"
+    _check_args_n 0 "$@"
     _NAME_ARCHIVE=orgdir
 
     # determine server and repo