From ae127a10b794c9bb6a8056af1ed8075409f276e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= <cristhian@qrokes.com>
Date: Thu, 25 Jan 2018 21:03:19 -0700
Subject: [PATCH] Delete DB improved

Catch error improved and press enter twice to skip in external DB.
---
 lib/general | 74 +++++++++++++++++++++++++++++++++++------------------
 weby        |  2 +-
 2 files changed, 50 insertions(+), 26 deletions(-)

diff --git a/lib/general b/lib/general
index bb2e34b..ee7f1c1 100644
--- a/lib/general
+++ b/lib/general
@@ -36,33 +36,57 @@ db_delete() {
 			fi
 			local ROOT_PASS=$( echo $(conf_read mysql-root) | openssl enc -d -a -salt )
 			sudo mysql --connect-timeout=10 --user=root -p$ROOT_PASS -e "$dbsetup"
-		else
-			echo ""
-			echo "${gre} External DB found in $domain "
-			read -p "${blu}External DB root username [root]: " uroot
-			read -p "External DB root password: " proot
-			echo "${end}"
-			sudo mysql --connect-timeout=10 -h "$url" -P "$port" -u"$uroot" -p"$proot" -e "$dbsetup"
-		fi
-		
-		if [ $? != "0" ]; then
-			done="0"
-			echo "${red}============================================"
-			echo "    [Error]: Database delete failed."
-			echo "============================================"
-			echo ""
-			echo "${blu}  Retry [Y/n]? "
-			while read -r -n 1 -s answer; do
-			  answer=${answer:-y}
-			  if [[ $answer = [YyNn] ]]; then
-				break
-			  fi
-			done
-			if [[ $answer  == [Nn] ]]; then
-				done="1"
+			if [ $? != "0" ]; then
+				done="0"
+				echo "${red}============================================"
+				echo "    [Error]: Database delete failed."
+				echo "============================================"
+				echo ""
+				echo "${blu}  Retry [Y/n]? "
+				while read -r -n 1 -s answer; do
+				  answer=${answer:-y}
+				  if [[ $answer = [YyNn] ]]; then
+					break
+				  fi
+				done
+				if [[ $answer  == [Nn] ]]; then
+					done="1"
+				fi
+			else
+				echo "${gre}Database of your site ${blu}${domain}${gre} has been successfully deleted! ${end}"
 			fi
 		else
-			echo "${gre}Database of your site ${blu}${domain}${gre} has been successfully deleted! ${end}"
+			echo ""
+			echo "${gre}External DB found in $domain (Press 'Enter' key twice to skip and not delete)"
+			read -p "${blu}External DB root username [root]: " uroot
+			uroot=${uroot:-root}
+			read -p "External DB root password: " proot
+			if [[ $uroot == "root" && -z $proot ]]; then
+				echo "${red} Action aborted!"
+				continue 1;
+			else
+				sudo mysql --connect-timeout=10 -h "$url" -P "$port" -u"$uroot" -p"$proot" -e "$dbsetup"
+				if [ $? != "0" ]; then
+					done="0"
+					echo "${red}============================================"
+					echo "    [Error]: Database delete failed."
+					echo "============================================"
+					echo ""
+					echo "${blu}  Retry [Y/n]? "
+					while read -r -n 1 -s answer; do
+					  answer=${answer:-y}
+					  if [[ $answer = [YyNn] ]]; then
+						break
+					  fi
+					done
+					if [[ $answer  == [Nn] ]]; then
+						done="1"
+					fi
+				else
+					echo "${gre}Database of your site ${blu}${domain}${gre} has been successfully deleted! ${end}"
+				fi
+			fi
+			echo "${end}"
 		fi
 	done
 	
diff --git a/weby b/weby
index bf7b210..2a38386 100644
--- a/weby
+++ b/weby
@@ -2,7 +2,7 @@
 
 # Webinoly script.
 # This script is designed to install latest Webinoly.
-webyversion="1.2.3-beta"
+webyversion="1.2.3"
 
 
 # Check OS support