Fix.

diff --git a/testing/home/desktop/.local/bin/borgplom b/testing/home/desktop/.local/bin/borgplom
index 58969e06cc22459a0d374964923b3fcf6e0ad569..adfc29e041b90d57e4d9c4525ceccbc82c637629 100755 (executable)
--- a/testing/home/desktop/.local/bin/borgplom
+++ b/testing/home/desktop/.local/bin/borgplom
@@ -21,6 +21,7 @@ path_repo_location() { printf '%s' "${PATH_BORG_CONF_SECURITY}/${1}/location"; }
 # exits
 error_exit() { abort "Aborting due to $1"; }
 error_exit_with_usage() { error_exit "${1}\n\n$(print_usage)"; }
+exit_ok() { echo "$@"; exit 0; }
 
 # commands
 USAGE_INDICES='backup_keys claim help info keys orgpull'
@@ -50,7 +51,7 @@ _id_from_file() { head -1 "$1" | cut -d' ' -f2; }
 USAGE_ARGS_backup_keys='PATH'
 USAGE_DESC_backup_keys="copy known keys to PATH/, with their repos' server names as filenames"
 CMDFNC_backup_keys() {
-    expect_n_args 1 1 "${USAGE_ARGS_backup_keys}" "$@"
+    expect_n_args 1 1 "${USAGE_ARGS_backup_keys}" $@
     _PATH_TARGET_DIR=$(realpath "$1")
     if [ -e "${_PATH_TARGET_DIR}" ] && [ ! -d "${_PATH_TARGET_DIR}" ]; then
         error_exit "non-directory at ${_PATH_TARGET_DIR}"
@@ -75,7 +76,7 @@ CMDFNC_backup_keys() {
 USAGE_ARGS_claim='PATH'
 USAGE_DESC_claim="register file of PATH as key to repo at \"$(location_from_servername SERVER_NAME)\", with SERVER_NAME the filename portion of PATH"
 CMDFNC_claim() {
-    expect_n_args 1 1 "${USAGE_ARGS_claim}" "$@"
+    expect_n_args 1 1 "${USAGE_ARGS_claim}" $@
     _PATH_SOURCE="$1"
     _ensure_no_overwrite_at() {
         if [ -f "$1" ]; then
@@ -105,7 +106,7 @@ CMDFNC_claim() {
 
 USAGE_DESC_help='print this help and exit'
 CMDFNC_help() {
-    expect_n_args 0 0 '' "$@"
+    expect_n_args 0 0 '' $@
     print_usage
 }
 
@@ -115,8 +116,7 @@ CMDFNC_info() {
     expect_n_args 1 2 "${USAGE_ARGS_info}" $@
     _TARGET_REPO="$(location_from_servername ${1})"
     if [ ! -z "$2" ]; then
-        borg info "${_TARGET_REPO}::$2"
-        exit 0
+        exit_ok $(borg info "${_TARGET_REPO}::$2")
     fi
     _run_borg_with_passphrase info "${_TARGET_REPO}"
     echo "${_OUTPUT}\n\nMost recent archives:"
@@ -125,7 +125,31 @@ CMDFNC_info() {
 
 USAGE_DESC_keys='list known repos in ID, key filename, and alleged location'
 CMDFNC_keys() {
-    expect_n_args 0 0 '' "$@"
+    expect_n_args 0 0 '' $@
+    echo "Known keys, as per ${PATH_BORG_CONF_KEYS}:"
+    _EXIT_OK_PREFIX='(none, since directory'
+    if [ ! -d "${PATH_BORG_CONF_KEYS}" ]; then
+        exit_ok "${_EXIT_OK_PREFIX} non-existant)"
+    fi
+    _KEYFILES="$(ls -1 ${PATH_BORG_CONF_KEYS})"
+    if [ -z "${_KEYFILES}" ]; then
+        exit_ok "${_EXIT_OK_PREFIX} empty)"
+    fi
+    echo "${_KEYFILES}" | while read _FILENAME; do
+        _KEY_ID=$(_id_from_file "${PATH_BORG_CONF_KEYS}/${_FILENAME}")
+       _PATH_LOC="$(path_repo_location ${_KEY_ID})"
+        printf "${_KEY_ID} ${_FILENAME} "
+        if [ -f "${_PATH_LOC}" ]; then
+            printf '%s\n' "$(cat ${_PATH_LOC})"
+        else
+            printf '?\n'
+        fi
+    done
+}
+
+USAGE_DESC_orgpull='pull most recent org directory available in repos'
+CMDFNC_orgpull() {
+    expect_n_args 0 0 '' $@
     _NAME_ARCHIVE=orgdir
 
     # determine server and repo