Remove "debug" and change how -collect works.

This commit is contained in:
purple 2023-07-04 14:28:19 +02:00
parent 77ba45b6e2
commit 2f7f831e38

View file

@ -11,6 +11,8 @@
if [[ -f ".dockerenv" ]]; then if [[ -f ".dockerenv" ]]; then
DOCKER="y"; DOCKER="y";
FOLDER="html" FOLDER="html"
else
DOCKER="n";
fi; fi;
# If the fallback version below does not match your downloaded version, please let us know. # If the fallback version below does not match your downloaded version, please let us know.
@ -78,10 +80,6 @@ quit_red() {
exit 1; 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. # Adds the "blueprint" command to the /usr/local/bin directory and configures the correct permissions for it.
touch /usr/local/bin/blueprint > /dev/null; touch /usr/local/bin/blueprint > /dev/null;
echo -e "#!/bin/bash\nbash /var/www/$FOLDER/blueprint.sh -bash \$@;" > /usr/local/bin/blueprint; 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 if [[ $esc == "y" ]]; then
rm -R .blueprint/tmp/$n; 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."; quit_red "[FATAL] Extension has failed security checks, halting installation.";
fi; fi;
@ -418,9 +415,7 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then
if [[ ( $flags == *"hasInstallScript,"* ) || ( $flags == *"hasInstallScript" ) ]]; then if [[ ( $flags == *"hasInstallScript,"* ) || ( $flags == *"hasInstallScript" ) ]]; then
log_yellow "[WARNING] This extension uses a custom installation script, proceed with caution."; 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; bash .blueprint/data/extensions/$identifier/install.sh;
debug "\nPost-installation script completed.";
fi; 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."; 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"" " "-build run an installation on your extension development files""
" "-export export your extension development files"" " "-export export your extension development files""
" "-runinstall rerun the blueprint installation script (advanced)"" " "-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)"; " "-upgrade (dev) update/reset to a newer pre-release version (advanced)";
fi; fi;
@ -611,9 +606,10 @@ fi;
# -collect # -collect
if [[ $2 == "-collect" ]]; then if [[ $2 == "-collect" ]]; then
echo -e "@@@@@@@@@@@@ LOGS.TXT START @@@@@@@@@@@@\n\n"; log_cyan "Variables";
echo -e $(cat .blueprint/data/internal/debug/logs.txt); log_blue "FOLDER: $FOLDER";
echo -e "\n\n@@@@@@@@@@@@@ LOGS.TXT END @@@@@@@@@@@@@"; log_blue "VERSION: $VERSION";
log_blue "DOCKER: $DOCKER";
fi; fi;
# -upgrade # -upgrade