From 9c94ebca1f6fbb4cdab4291649cf1d1dccdd025a Mon Sep 17 00:00:00 2001
From: vaidis <ste.vaidis@gmail.com>
Date: Tue, 10 Jan 2023 00:17:52 +0200
Subject: [PATCH] ssh protocol added

---
 backup.sh | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/backup.sh b/backup.sh
index 8c87cda..817cdf1 100755
--- a/backup.sh
+++ b/backup.sh
@@ -48,16 +48,11 @@ function mount_smb() {
 
 function mount_ssh() {
     if mkdir /mnt/${PID}; then
-        if ssh -q  -o BatchMode=yes -o ConnectTimeout=10 ${USER}@${HOST} exit; then
-            if ssh ${USER}@${HOST} ls -l ${DIR} 2> /dev/null; then
-                if sshfs -o ro ${USER}@${HOST}:${SOURCE} /mnt/${PID}; then
-                    return 0
-                else
-                    log "[FAIL] mount ${USER}@${HOST}:${SOURCE} to /mnt/${SRC}"
-                    return 1
-                fi
+        if ssh -q -o BatchMode=yes -o ConnectTimeout=10 ${USER}@${HOST} exit; then
+            if sshfs -o ro ${USER}@${HOST}:${SHARE} /mnt/${PID}; then
+                return 0
             else
-                log "[FAIL] remote dir ${DIR} not found"
+                log "[FAIL] mount ${USER}@${HOST}:${SHARE} to /mnt/${SRC}"
                 return 1
             fi
         else
@@ -226,10 +221,14 @@ function statistics_usb() {
     log "USB DISK Free   : ${USBFREE}"
 }
 
-function mount_only() {
-    if find_luks; then
-        if get_luks_password; then
-            mount_usb
+function debug_mount() {
+    if get_luks_password; then
+        if find_luks; then
+            if mount_luks $LUKS_PASS $USB_DEV; then
+                if mount_usb; then
+                    ls -l /mnt/usb
+                fi
+            fi
         fi
     fi
     exit
@@ -304,10 +303,10 @@ do
             usage
             ;;
         --mount)
-            mount_only
+            debug_mount
             ;;      
         --umount)
-            umount_x
+            umount_usb && luks_close
             ;;
         --format=*)
             FORMAT="${i#*=}"
@@ -342,12 +341,12 @@ if [[ -n "$CONFIG" ]]; then
 
     [ -z "$PROTO" ] && usage "config \e[92m'PROTO'\e[39m is missing"
     [ -z "$SHARE" ] && usage "config \e[92m'SHARE'\e[39m is missing"
-    [ -z "$USER" ] && usage "config \e[92m'USER'\e[39m is missing"
-    [ -z "$PASS" ] && usage "config \e[92m'PASS'\e[39m is missing"
     [ -z "$SOURCE" ] && usage "config \e[92m'SOURCE'\e[39m is missing"
     [ -z "$DESTINATION" ] && usage "config \e[92m'DESTINATION'\e[39m is missing"
 
     if [ "$PROTO" = "smb" ]; then
+        [ -z "$USER" ] && usage "config \e[92m'USER'\e[39m is missing"
+        [ -z "$PASS" ] && usage "config \e[92m'PASS'\e[39m is missing"
         if mount_smb; then
             main
         fi