From 1e9eda764a98bda668baed8b23fba6d3726f0307 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristhian=20Mart=C3=ADnez=20Ochoa?= Date: Mon, 26 Feb 2024 19:23:31 -0700 Subject: [PATCH] messages More messages improved. --- lib/sites | 2 +- usr/site | 2 +- usr/webinoly | 1 + weby | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/sites b/lib/sites index 5c64336..1c41ee9 100644 --- a/lib/sites +++ b/lib/sites @@ -206,7 +206,7 @@ wpinstall() { fi if [[ $ext_login == "true" ]]; then - echo "${blu}${dim}External DB Credentials found!${end}" + echo "${blu}${dim}External DB Credentials found! (${dburl}:${dbport})${end}" elif [[ -n $retry && $retry -ge 3 ]]; then setupmysql="N" local db_error_flag="true" diff --git a/usr/site b/usr/site index 3ad2845..bed8719 100644 --- a/usr/site +++ b/usr/site @@ -36,7 +36,7 @@ if [[ -n $wp || -n $mysql ]]; then [[ $wp == "true" ]] && wp="[true,true,${exth},${dona},${dona},random,wp_,$(conf_read external-dbu),$(conf_read external-dbp)]" [[ $mysql == "true" ]] && mysql="[${exth},${dona},${dona},random,$(conf_read external-dbu),$(conf_read external-dbp)]" - echo "${blu}${dim}External DB credentials found!${end}" + echo "${blu}${dim}External DB credentials found! (${exth})${end}" fi if [[ ( -n $wp && $wp != true ) || ( -n $mysql && $mysql != true ) ]]; then diff --git a/usr/webinoly b/usr/webinoly index 9e693f2..36fdf57 100644 --- a/usr/webinoly +++ b/usr/webinoly @@ -43,6 +43,7 @@ elif [[ -n $verify ]]; then webinoly_verify [[ $? != 0 ]] && exit 1 nginx_not="true" # Nginx-Reload not-needed. + [[ $verify == "critical" ]] && ads_block="true" # Don't show ads elif [[ -n $dbpass ]]; then diff --git a/weby b/weby index 883dc7f..c1ae8d2 100644 --- a/weby +++ b/weby @@ -231,7 +231,7 @@ elif [[ $setup != [123] ]]; then fi # Message Center -if [[ -z $(conf_read stack-build-error-flag) ]]; then +if [[ -z $(conf_read stack-build-error-flag) && $type != "Error" ]]; then # We use $type instead of dynvar to not make it persistant! if [[ $new_install == "true" && $setup == 0 ]]; then echo "${blu}You have chosen the option '0', it means that you have to manually build your own stack." echo "But, don't worry! With Webinoly this is an easy task, just use the stack command, i.e. 'sudo stack -lemp' ${end}"