From c3365e5bd32ae7646ae904907087e2210a6386b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Fri, 2 Nov 2018 11:40:12 -0700 Subject: [PATCH] db-delete-all fixed Infinite loop caused by background process --- lib/general | 2 +- lib/sites | 2 +- plugins/site | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/general b/lib/general index 71e3859..678e32e 100644 --- a/lib/general +++ b/lib/general @@ -35,7 +35,7 @@ db_delete() { if [[ ! -d /etc/mysql || $(conf_read mysql) != "true" || $(conf_read mysql-client) != "true" ]]; then echo "${red}[ERROR] Seems like MySQL is not installed or Webinoly can not detect it!" echo " - Database can not be deleted -${blu} $domain ${end}" - exit 1 + return 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" diff --git a/lib/sites b/lib/sites index 29a7b85..497f35a 100644 --- a/lib/sites +++ b/lib/sites @@ -470,7 +470,7 @@ deletesite() { fi fi - [[ $dbdel == [yY] ]] && db_delete $domain & + [[ $dbdel == [yY] ]] && db_delete $domain # Delete site files sudo rm /etc/nginx/sites-available/$domain diff --git a/plugins/site b/plugins/site index 2f85bf1..e8430d1 100644 --- a/plugins/site +++ b/plugins/site @@ -141,7 +141,7 @@ elif [[ "$domain" == "-delete-all" && -z "$type" && -z "$cache" ]]; then # List sites then will be deleted if [[ $domi != "html" && $domi != $(conf_read tools-port) ]]; then # Determina if site is WP (so has DB to delete) - [[ -a $site/wp-config.php || -a $site/htdocs/wp-config.php ]] && db_delete $domi & + [[ -a $site/wp-config.php || -a $site/htdocs/wp-config.php ]] && db_delete $domi sudo rm -rf /etc/nginx/sites-available/$domi sudo rm -rf /etc/nginx/sites-enabled/$domi