From 5dc7370ca6a45d417ecad4c64c8ca6f8947e7d90 Mon Sep 17 00:00:00 2001
From: "Hahn Axel (hahn)" <axel.hahn@unibe.ch>
Date: Thu, 1 Feb 2024 10:57:00 +0100
Subject: [PATCH] update restore menu

---
 plugins/transfer/restic.sh |  2 +-
 restore.sh                 | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/transfer/restic.sh b/plugins/transfer/restic.sh
index 0b8b3b9..4ad31c3 100644
--- a/plugins/transfer/restic.sh
+++ b/plugins/transfer/restic.sh
@@ -173,7 +173,7 @@
     function t_backupDoPostTasks(){
 
         # --------------------
-        echo "--- UNLOCK ... just in case :-)" 
+        echo "--- UNLOCK" 
         _restic unlock
         echo
 
diff --git a/restore.sh b/restore.sh
index 14b441b..3b1ce4d 100755
--- a/restore.sh
+++ b/restore.sh
@@ -23,6 +23,7 @@
 # 2019-06-05  ah,ds  v1.3  add custom cache dir
 # 2021-05-19  ah,ds, v2.0  plugin driven 
 # 2022-10-21  ah     v2.1  init vars; shell fixes
+# 2024-02-01  ah     v2.2  update restore menu
 # ================================================================================
 
 
@@ -208,7 +209,8 @@ function doRestore(){
   echo Have look to the output above.
   echo "The restore path has $(find ${RESTORE_TARGETPATH} | wc -l) items ($(du -hs ${RESTORE_TARGETPATH} | awk '{ print $1 }'))"
   echo 
-  echo "find ${RESTORE_TARGETPATH}"
+  echo "    find ${RESTORE_TARGETPATH}"
+  echo 
   exit
 
 }
@@ -251,13 +253,12 @@ function doRestore(){
       echo
     echo
     # echo " C - show file changes"
-    echo " S - search files"
     # echo " V - verify"
     # echo
     echo " R - start restore with $STORAGE_BIN"
     echo
     echo "     restore from         : $STORAGE_TARGETPATH"
-    echo "     restore to           : $RESTORE_TARGETPATH"
+    echo "     restore to           : $( color cmd ; echo -n $RESTORE_TARGETPATH; color reset)"
     echo -n "                            "
     if [ -n "$RESTORE_TARGETPATH" ]; then
       ls -d "$RESTORE_TARGETPATH" >/dev/null 2>&1
@@ -272,8 +273,9 @@ function doRestore(){
       echo "(not set)"
     fi
     echo
-    echo "---------- Other:"
+    echo "---------- Other options:"
     echo
+    echo " S - search files"
     echo " B - Bash (Shell)"
     echo " X - exit"
     echo
-- 
GitLab