Standardized the quit/deploy, use Z instead of Q

plexguide · Jul 18, 2019 · d39c77b · d39c77b
1 parent 6e713fc
commit d39c77b
Show file tree

Hide file tree

Showing 11 changed files with 33 additions and 33 deletions.
diff --git a/menu/amazonaws/amazonaws.sh b/menu/amazonaws/amazonaws.sh
@@ -180,9 +180,9 @@ Server Name
 EOF
   hcloud server list | tail -n +2 | cut -d " " -f2- | cut -d " " -f2- | cut -d " " -f2-
   echo
-  echo "Quit? Type >>> exit"
+  echo "To quit, type >>> z or exit"
   read -p 'Type a Server to Destroy | Press [ENTER]: ' destroy </dev/tty
-  if [ "$destroy" == "exit" ]; then
+  if [[ "$destroy" == "exit" || "$destroy" == "Exit" || "$destroy" == "EXIT" || "$destroy" == "z" || "$destroy" == "Z" ]]; then
     bash /opt/plexguide/menu/hetzner/hetzner.sh
     exit
   else

diff --git a/menu/dlpath/dlpath.sh b/menu/dlpath/dlpath.sh
@@ -76,7 +76,7 @@ EOF
   read -p '↘️   Type the NEW PATH (Follow Above Examples): ' typed </dev/tty
 
   # SubQuestion About Continuing
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     exit
   fi
 

diff --git a/menu/dlpath/dlpathold.sh b/menu/dlpath/dlpathold.sh
@@ -58,14 +58,14 @@ Examples:
 /secondhd/media
 /myhd/storage/media
 
-echo "To QUIT, type >>> q exit"
+echo "To quit, type >>> z or exit"
 EOF
 
   read -p 'Type the NEW PATH (follow example above): ' typed
 
   storage=$(grep $typed /var/plexguide/ver.temp)
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     tee <<-EOF
 
 ---------------------------------------------------------------------------

diff --git a/menu/functions/pgvault.func b/menu/functions/pgvault.func
@@ -151,12 +151,12 @@ serverprime() {
 
 $servers
 
-💬 Quitting? TYPE > q or exit
+💬 To quit, type >>> z or exit
 EOF
   read -p '🌍 Type Server Name | Press [ENTER]: ' server </dev/tty
   echo $server >/tmp/server.select
 
-  if [ "$server" == "exit" ]; then exit; fi
+  if [[ "$server" == "exit" || "$server" == "Exit" || "$server" == "EXIT" || "$server" == "z" || "$server" == "Z" ]]; then exit; fi
 
   current2=$(cat /tmp/server.list | grep "\<$server\>")
   if [ "$current2" == "" ]; then
@@ -424,12 +424,12 @@ $notrun
 
 $buildup
 
-💬 Quitting? TYPE > q or exit | 💪 Ready to Backup? TYPE > deploy
+💬 To quit, type >>> z or exit | 💪 Ready to Backup? type > backup
 EOF
   read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "deploy" ]; then backup_start; fi
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+  if [[ "$typed" == "backup" || "$typed" == "a" || "$typed" == "A" ]]; then backup_start; fi
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
   current2=$(cat /var/plexguide/pgvault.buildup | grep "\<$typed\>")
   if [ "$current2" != "" ]; then
@@ -466,12 +466,12 @@ $notrun
 
 $buildup
 
-💬 Quitting? TYPE > q or exit | 💪 Ready to Restore? TYPE > deploy
+💬 To quit, type >>> z or exit | 💪 Ready to Restore? type >>> restore
 EOF
   read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "deploy" ]; then restore_start; fi
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+  if [[ "$typed" == "restore" || "$typed" == "a" || "$typed" == "A" ]]; then restore_start; fi
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
   current2=$(cat /var/plexguide/pgvault.buildup | grep "\<$typed\>")
   if [ "$current2" != "" ]; then

diff --git a/menu/interface/version/file.sh b/menu/interface/version/file.sh
@@ -24,13 +24,13 @@ EOF
 
 cat /var/plexguide/ver.temp
 echo ""
-echo "To QUIT, type >>> exit"
+echo "To QUIT, type >>> z or exit"
 break=no
 while [ "$break" == "no" ]; do
   read -p '↘️  Type [PG Version] | PRESS ENTER: ' typed
   storage=$(grep $typed /var/plexguide/ver.temp)
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     echo ""
     touch /var/plexguide/exited.upgrade
     exit

diff --git a/menu/pgbox/pgbox.sh b/menu/pgbox/pgbox.sh
@@ -95,13 +95,13 @@ $notrun
 
 $buildup
 
-💬 Quitting? TYPE > q or exit | 💪 Ready to install? TYPE > deploy
+💬 To quit, type >>> z or exit | 💪 Ready to install? type >>> install
 EOF
   read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "deploy" ]; then question2; fi
+  if [[ "$typed" == "deploy" || "$typed" == "Deploy" || "$typed" == "DEPLOY" || "$typed" == "install" || "$typed" == "Install" || "$typed" == "INSTALL" || "$typed" == "a" || "$typed" == "A" ]]; then question2; fi
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
   current=$(cat /var/plexguide/pgbox.buildup | grep "\<$typed\>")
   if [ "$current" != "" ]; then queued && question1; fi

diff --git a/menu/pgbox/pgboxcommunity.sh b/menu/pgbox/pgboxcommunity.sh
@@ -134,13 +134,13 @@ $notrun
 
 $buildup
 
-💬 Quitting? TYPE > q or exit | 💪 Ready to install? TYPE > deploy
+💬 To quit, type >>> z or exit | 💪 Ready to install? type >>> install
 EOF
   read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-  if [[ "$typed" == "deploy" ]]; then question2; fi
+  if [[ "$typed" == "deploy" || "$typed" == "Deploy" || "$typed" == "DEPLOY" || "$typed" == "install" || "$typed" == "Install" || "$typed" == "INSTALL" || "$typed" == "a" || "$typed" == "A" ]]; then question2; fi
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
   current=$(cat /var/plexguide/pgbox.buildup | grep "\<$typed\>")
   if [ "$current" != "" ]; then queued && question1; fi

diff --git a/menu/pgbox/pgboxcore.sh b/menu/pgbox/pgboxcore.sh
@@ -134,13 +134,13 @@ $notrun
 
 $buildup
 
-💬 Quitting? TYPE > q or exit | 💪 Ready to Install? TYPE > deploy
+💬 To quit, type >>> z or exit | 💪 Ready to Install? type >>> install
 EOF
   read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-  if [[ "$typed" == "deploy" ]]; then question2; fi
+  if [[ "$typed" == "deploy" || "$typed" == "Deploy" || "$typed" == "DEPLOY" || "$typed" == "install" || "$typed" == "Install" || "$typed" == "INSTALL" || "$typed" == "a" || "$typed" == "A" ]]; then question2; fi
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
   current=$(cat /var/plexguide/pgbox.buildup | grep "\<$typed\>")
   if [ "$current" != "" ]; then queued && question1; fi

diff --git a/menu/pgtrakt/pgtrakt.sh b/menu/pgtrakt/pgtrakt.sh
@@ -80,7 +80,7 @@ Go Back? Type > exit
 EOF
   read -p '↘️ Type Sonarr Location | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     question1
   else
     tee <<-EOF
@@ -124,7 +124,7 @@ Go Back? Type > exit
 EOF
   read -p '↘️ Type Radarr Location | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     question1
   else
     tee <<-EOF
@@ -169,7 +169,7 @@ EOF
   read -p '↘️ Type API Secret | Press [ENTER]: ' typed </dev/tty
   echo $typed >/var/plexguide/pgtrak.secret
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     question1
   else
     tee <<-EOF
@@ -210,7 +210,7 @@ Go Back? Type > exit
 EOF
   read -p '↘️ Type Sonarr Location | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     question1
   else
     tee <<-EOF
@@ -301,7 +301,7 @@ Go Back? Type > exit
 EOF
   read -p '↘️ Type Radarr Location | Press [ENTER]: ' typed </dev/tty
 
-  if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     question1
   else
     tee <<-EOF

diff --git a/menu/removal/removal.sh b/menu/removal/removal.sh
@@ -56,11 +56,11 @@ tee <<-EOF
 
 $running
 
-💬 Quitting? TYPE > q or exit
+💬 To quit, type >>> z or exit
 EOF
 read -p '🌍 Type APP for QUEUE | Press [ENTER]: ' typed </dev/tty
 
-if [ "$typed" == "exit" ] || [ "$typed" == "q" ] || [ "$typed" == "Q" ]; then exit; fi
+if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then exit; fi
 
 tcheck=$(echo $running | grep "\<$typed\>")
 if [ "$tcheck" == "" ]; then

diff --git a/menu/version/file.sh b/menu/version/file.sh
@@ -30,7 +30,7 @@ Latest:  : $latest
 Beta      : $beta
 Installed : $pgnumber
 
-Quitting? TYPE > q or exit
+To quit, type >>> z or exit
 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
 EOF
 
@@ -42,7 +42,7 @@ EOF
 }
 
 parttwo() {
-  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "q" || "$typed" == "Q" ]]; then
+  if [[ "$typed" == "exit" || "$typed" == "Exit" || "$typed" == "EXIT" || "$typed" == "z" || "$typed" == "Z" ]]; then
     echo ""
     touch /var/plexguide/exited.upgrade
     exit