From 957993aff537fece7d3d3d7a6cbbf10cab4ca0e3 Mon Sep 17 00:00:00 2001
From: Christoph <ckubu@oopen.de>
Date: Wed, 1 Jan 2025 13:30:26 +0100
Subject: [PATCH] borg-extract-archiv.sh,borg-list-backups.sh: some minor fixes
 in case og localhost.

---
 borg-extract-archiv.sh | 84 ++++++++++++++++++++++--------------------
 borg-list-backups.sh   |  4 +-
 2 files changed, 48 insertions(+), 40 deletions(-)

diff --git a/borg-extract-archiv.sh b/borg-extract-archiv.sh
index 646ebc8..ed1da14 100755
--- a/borg-extract-archiv.sh
+++ b/borg-extract-archiv.sh
@@ -221,7 +221,8 @@ DEFAULT_BORG_RSH='ssh -i /root/.ssh/id_ed25519-borg-backup'
 if [[ -f "$conf_file" ]]; then
    source "$conf_file"
 else
-   fatal  "No configuration file '$conf_file' present!"
+   warn  "No configuration file '$conf_file' present!"
+   #fatal  "No configuration file '$conf_file' present!"
 fi
 
 
@@ -281,7 +282,7 @@ if [[ -n "${_BORG_HOST}" ]] ; then
          FQHN_BORG_HOSTNAME="${_BORG_HOST}"
          break
       fi
-      if [[ ${FQHN_BORG_HOSTNAME}  =~ ^127 ]] || [[ "${FQHN_BORG_HOSTNAME,,}"  =~ "localhost" ]] ; then
+      if [[ ${FQHN_BORG_HOSTNAME}  =~ ^127 ]] || [[ "${FQHN_BORG_HOSTNAME,,}"  = "localhost" ]] ; then
          break
       fi
       if [[ ! ${FQHN_BORG_HOSTNAME} =~ \. ]]; then
@@ -293,6 +294,9 @@ else
    while [[ "X${FQHN_BORG_HOSTNAME}" = "X" ]]; do
       echononl "Full borg hostname: "
       read FQHN_BORG_HOSTNAME
+      if [[ ${FQHN_BORG_HOSTNAME}  =~ ^127 ]] || [[ "${FQHN_BORG_HOSTNAME,,}"  = "localhost" ]] ; then
+         break
+      fi
       if [[ "X${FQHN_BORG_HOSTNAME}" = "X" ]]; then
          echo -e "\n\t\033[33m\033[1mFull qualified hostname is reqired\033[m\n"
       fi
@@ -363,46 +367,48 @@ else
    done
 fi
 
+if [[ ! ${FQHN_BORG_HOSTNAME}  =~ ^127 ]] && [[ ! "${FQHN_BORG_HOSTNAME,,}"  = "localhost" ]] ; then
 
-SSH_USER=""
-echo -e "\033[32m--\033[m"
-echo ""
-echo "Specify the ssh user to connect to the Borg host '${BORG_HOST}'."
-echo ""
-echononl "SSH user [${_SSH_USER}]: "
-read SSH_USER
-if [[ "X${SSH_USER}" = "X" ]]; then
-   SSH_USER="${_SSH_USER}"
+   SSH_USER=""
+   echo -e "\033[32m--\033[m"
+   echo ""
+   echo "Specify the ssh user to connect to the Borg host '${BORG_HOST}'."
+   echo ""
+   echononl "SSH user [${_SSH_USER}]: "
+   read SSH_USER
+   if [[ "X${SSH_USER}" = "X" ]]; then
+      SSH_USER="${_SSH_USER}"
+   fi
+
+
+   SSH_PORT=""
+   echo -e "\033[32m--\033[m"
+   echo ""
+   echo "Specify the ssh port to connect to the Borg host '${BORG_HOST}'."
+   echo ""
+   while [[ "X${SSH_PORT}" = "X" ]]; do
+      echononl "SSH user [${_SSH_PORT}]: "
+      read SSH_PORT
+      if [[ "X${SSH_PORT}" = "X" ]]; then
+         SSH_PORT="${_SSH_PORT}"
+      fi
+   done
+
+
+   BORG_RSH=""
+   echo -e "\033[32m--\033[m"
+   echo ""
+   echo "Specify the ssh command which is used to connect to the Borg host '${BORG_HOST}'."
+   echo ""
+   while [[ "X${BORG_RSH}" = "X" ]]; do
+      echononl "SSH command [${_BORG_RSH}]: "
+      read BORG_RSH
+      if [[ "X${BORG_RSH}" = "X" ]]; then
+         BORG_RSH="${_BORG_RSH}"
+      fi
+   done
 fi
 
-
-SSH_PORT=""
-echo -e "\033[32m--\033[m"
-echo ""
-echo "Specify the ssh port to connect to the Borg host '${BORG_HOST}'."
-echo ""
-while [[ "X${SSH_PORT}" = "X" ]]; do
-   echononl "SSH user [${_SSH_PORT}]: "
-   read SSH_PORT
-   if [[ "X${SSH_PORT}" = "X" ]]; then
-      SSH_PORT="${_SSH_PORT}"
-   fi
-done
-
-
-BORG_RSH=""
-echo -e "\033[32m--\033[m"
-echo ""
-echo "Specify the ssh command which is used to connect to the Borg host '${BORG_HOST}'."
-echo ""
-while [[ "X${BORG_RSH}" = "X" ]]; do
-   echononl "SSH command [${_BORG_RSH}]: "
-   read BORG_RSH
-   if [[ "X${BORG_RSH}" = "X" ]]; then
-      BORG_RSH="${_BORG_RSH}"
-   fi
-done
-
 blank_line
 
 echo -e "\033[32m--\033[m"
diff --git a/borg-list-backups.sh b/borg-list-backups.sh
index 46f763e..2ddf68a 100755
--- a/borg-list-backups.sh
+++ b/borg-list-backups.sh
@@ -228,7 +228,9 @@ DEFAULT_BORG_RSH='ssh -i /root/.ssh/id_ed25519-borg-backup'
 if [[ -f "$conf_file" ]]; then
    source "$conf_file"
 else
-   fatal  "No configuration file '$conf_file' present!"
+   if [[ -z "${BORG_HOST}" ]] || [[ -z "${BORG_REPO}" ]] || [[ -z "${BORG_PASSPHRASE}" ]] ; then
+      fatal  "No configuration file '$conf_file' present!"
+   fi
 fi