Merge pull request #46 from Kustys/main

Update blueprint.sh
This commit is contained in:
Ivy 2024-06-23 08:44:04 +02:00 committed by GitHub
commit 2898004ed5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1355,7 +1355,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
if [[ -f ".blueprint/tmp/$n/$dashboard_components/Components.yml" ]] \ if [[ -f ".blueprint/tmp/$n/$dashboard_components/Components.yml" ]] \
&& [[ $dashboard_components != "" ]]; then && [[ $dashboard_components != "" ]]; then
cp ".blueprint/tmp/$n/$dashboard_components/Components.yml" ".blueprint/extensions/$identifier/private/.store/Components.yml" cp ".blueprint/tmp/$n/$dashboard_components/Components.yml" ".blueprint/extensions/$identifier/private/.store/Components.yml"
<<<<<<< HEAD
fi fi
#backup Console.yml #backup Console.yml
@ -1364,16 +1363,6 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) || ( $2 == "-add" ) ]]; then VCMD="
cp ".blueprint/tmp/$n/$data_console/Console.yml" ".blueprint/extensions/$identifier/private/.store/Console.yml" cp ".blueprint/tmp/$n/$data_console/Console.yml" ".blueprint/extensions/$identifier/private/.store/Console.yml"
fi fi
=======
fi
#backup Console.yml
if [[ -f ".blueprint/tmp/$n/$data_console/Console.yml" ]] \
&& [[ $data_console != "" ]]; then
cp ".blueprint/tmp/$n/$data_console/Console.yml" ".blueprint/extensions/$identifier/private/.store/Console.yml"
fi
>>>>>>> console-api
# End creating data directory. # End creating data directory.
@ -2478,4 +2467,4 @@ if [[ ${VCMD} != "y" && $1 == "-bash" ]]; then
# This is logged as a "fatal" error since it's something that is making Blueprint run unsuccessfully. # This is logged as a "fatal" error since it's something that is making Blueprint run unsuccessfully.
PRINT FATAL "'$2' is not a valid command or argument. Use argument '-help' for a list of commands." PRINT FATAL "'$2' is not a valid command or argument. Use argument '-help' for a list of commands."
exit 2 exit 2
fi fi