From 2f7f831e380c7a90c79a4961db189aa39e359806 Mon Sep 17 00:00:00 2001 From: purple Date: Tue, 4 Jul 2023 14:28:19 +0200 Subject: [PATCH] Remove "debug" and change how -collect works. --- blueprint.sh | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/blueprint.sh b/blueprint.sh index 79b10f4..c1b1df7 100644 --- a/blueprint.sh +++ b/blueprint.sh @@ -11,6 +11,8 @@ if [[ -f ".dockerenv" ]]; then DOCKER="y"; FOLDER="html" +else + DOCKER="n"; fi; # If the fallback version below does not match your downloaded version, please let us know. @@ -78,10 +80,6 @@ quit_red() { exit 1; }; -debug() { - log_cyan "[DEBUG] ${$1}" > /dev/null; -} - # Adds the "blueprint" command to the /usr/local/bin directory and configures the correct permissions for it. touch /usr/local/bin/blueprint > /dev/null; echo -e "#!/bin/bash\nbash /var/www/$FOLDER/blueprint.sh -bash \$@;" > /usr/local/bin/blueprint; @@ -237,7 +235,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then if [[ $esc == "y" ]]; then rm -R .blueprint/tmp/$n; - debug "The following error is thrown because one of your conf.yml path items starts with '/', '.' or contains '\\n'."; quit_red "[FATAL] Extension has failed security checks, halting installation."; fi; @@ -418,9 +415,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then if [[ ( $flags == *"hasInstallScript,"* ) || ( $flags == *"hasInstallScript" ) ]]; then log_yellow "[WARNING] This extension uses a custom installation script, proceed with caution."; - debug "Extension has custom post-installation script, running now..\n"; bash .blueprint/data/extensions/$identifier/install.sh; - debug "\nPost-installation script completed."; fi; log_green "\n\n[SUCCESS] $identifier should now be installed. If something didn't work as expected, please let us know at ptero.shop/issue."; @@ -437,7 +432,7 @@ if [[ ( $2 == "help" ) || ( $2 == "-help" ) || ( $2 == "--help" ) ]]; then " "-build run an installation on your extension development files"" " "-export export your extension development files"" " "-runinstall rerun the blueprint installation script (advanced)"" -" "-collect collect debug information"" +" "-collect collect debug info"" " "-upgrade (dev) update/reset to a newer pre-release version (advanced)"; fi; @@ -611,9 +606,10 @@ fi; # -collect if [[ $2 == "-collect" ]]; then - echo -e "@@@@@@@@@@@@ LOGS.TXT START @@@@@@@@@@@@\n\n"; - echo -e $(cat .blueprint/data/internal/debug/logs.txt); - echo -e "\n\n@@@@@@@@@@@@@ LOGS.TXT END @@@@@@@@@@@@@"; + log_cyan "Variables"; + log_blue "FOLDER: $FOLDER"; + log_blue "VERSION: $VERSION"; + log_blue "DOCKER: $DOCKER"; fi; # -upgrade