From d39c77b53e76fc04290875efd1b7e067c4e387a5 Mon Sep 17 00:00:00 2001
From: LooseSeal2 <lucile2@protonmail.com>
Date: Thu, 18 Jul 2019 14:32:21 -0700
Subject: [PATCH] Standardized the quit/deploy, use Z instead of Q

---
 menu/amazonaws/amazonaws.sh    |  4 ++--
 menu/dlpath/dlpath.sh          |  2 +-
 menu/dlpath/dlpathold.sh       |  4 ++--
 menu/functions/pgvault.func    | 16 ++++++++--------
 menu/interface/version/file.sh |  4 ++--
 menu/pgbox/pgbox.sh            |  6 +++---
 menu/pgbox/pgboxcommunity.sh   |  6 +++---
 menu/pgbox/pgboxcore.sh        |  6 +++---
 menu/pgtrakt/pgtrakt.sh        | 10 +++++-----
 menu/removal/removal.sh        |  4 ++--
 menu/version/file.sh           |  4 ++--
 11 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/menu/amazonaws/amazonaws.sh b/menu/amazonaws/amazonaws.sh
index f8d3508615..4d82b7414a 100644
--- 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
index fe940aae58..7a037ba705 100644
--- 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
index 43fd660e80..a7ee659240 100644
--- 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
index e53e3d66e1..c8a16572ab 100644
--- 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
index 80ade71fd1..203e247d9f 100644
--- 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
index c2e2e646c9..86f126083a 100644
--- 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
index 13d9d03d38..af9d2ec8a3 100644
--- 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
index 542bd9277c..ed5c4705c8 100644
--- 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
index fc86796a12..c60febf6c9 100755
--- 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
index 2f79b5cb9e..ff57efd8ae 100644
--- 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
index 873c30f053..43a9ead76b 100644
--- 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