From d327242faea805725b52270919cb693fa59781f4 Mon Sep 17 00:00:00 2001
From: Ste Vaidis <ste.vaidis@gmail.com>
Date: Tue, 27 Feb 2024 12:45:59 +0200
Subject: [PATCH] Update production/download_site/select.sh

---
 production/download_site/select.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/production/download_site/select.sh b/production/download_site/select.sh
index d22f86b..b2668ed 100644
--- a/production/download_site/select.sh
+++ b/production/download_site/select.sh
@@ -33,23 +33,25 @@ dialog --no-lines --menu "Choose a directory from ${ROOT_PATH}:" 0 0 0 "${menu_i
 menu_choice=$(cat /tmp/menu_choice)
 rm -f /tmp/menu_choice
 echo
+
 #
 # Find the site root directory
 #
 SELECTED_DIR=$(echo ${menu_choice} | awk '{print $3}')
 [ "${SELECTED_DIR}" == "" ] && echo "No directory selected" && exit
+[ ! -d "${SELECTED_DIR}" ] && echo "Cannot find selected directory ${SELECTED_DIR}" && exit
 echo "SELECTED_DIR :" $SELECTED_DIR
 
-VHOST_DIR=${ROOT_PATH}/$SELECTED_DIR
-[ ! -d "${ROOT_PATH}/${SELECTED_DIR}" ] && echo "Cannot find selected vhost directory ${VHOST_DIR}" && exit
-echo -e "VHOST_DIR    :" $VHOST_DIR
+#VHOST_DIR=${ROOT_PATH}/${SELECTED_DIR}
+#[ ! -d "${SELECTED_DIR}" ] && echo "Cannot find selected vhost directory ${VHOST_DIR}" && exit
+#echo -e "VHOST_DIR    :" $VHOST_DIR
 
 #
 # Find the index.php or index.html, the full path and the dir name
 #
-SITE_INDEX=$(find ${VHOST_DIR} -name index.php -printf "%d %p\n"|sort -n|perl -pe 's/^\d+\s//;' | head -n1)
+SITE_INDEX=$(find ${SELECTED_DIR} -name index.php -printf "%d %p\n"|sort -n|perl -pe 's/^\d+\s//;' | head -n1)
 if [ "${SITE_INDEX}" == "" ];then
-  SITE_INDEX=$(find ${VHOST_DIR} -name index.html -printf "%d %p\n"|sort -n|perl -pe 's/^\d+\s//;' | head -n1)
+  SITE_INDEX=$(find ${SELECTED_DIR} -name index.html -printf "%d %p\n"|sort -n|perl -pe 's/^\d+\s//;' | head -n1)
 fi
 
 echo -e "INDEX        :" $SITE_INDEX
@@ -83,7 +85,7 @@ cd /root
 #
 # Confirm this is the right type of site
 #
-read -p "This is a ${SITE_TYPE} site. Continue to backup?" -n 1 -r
+read -p "This is a ${SITE_TYPE} site. Continue to backup [y/n] ? " -n 1 -r
 if [[ $REPLY =~ ^[Yy]$ ]]; then
     echo
     #
@@ -94,5 +96,3 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
     [ ${SITE_TYPE} == 'unknown' ] && echo "Backup for ${SITE_TYPE} types has not yet implemented!" && exit
 fi
 echo
-
-