Skip to content
Snippets Groups Projects
Commit 8ba81079 authored by jurgenhaas's avatar jurgenhaas
Browse files

Merge branch 'develop' into feature/macos

parents b2ce6936 0c18ab4b
No related branches found
No related tags found
1 merge request!1Feature/macos
...@@ -22,9 +22,13 @@ function infol3d() { ...@@ -22,9 +22,13 @@ function infol3d() {
${SCRIPTPATH}/list ${SCRIPTPATH}/list
else else
if [[ "$1" == "info" ]]; then if [[ "$1" == "info" ]]; then
echo "Here we will be printing useful information soon !!!" if [[ -f .env ]]; then
more .env
fi
else else
echo "You're calling L3D inside of L3D, that's not useful." echo -e "\\033[31m ======================================== \\033[0m"
echo -e "\\033[31m Calling L3D inside of L3D is not useful. \\033[0m"
echo -e "\\033[31m ======================================== \\033[0m"
fi fi
fi fi
sectionFooter sectionFooter
......
...@@ -19,18 +19,22 @@ if [[ "$UPDATE" == *"setup:${NEWVERSION} not found"* ]]; then ...@@ -19,18 +19,22 @@ if [[ "$UPDATE" == *"setup:${NEWVERSION} not found"* ]]; then
fi fi
echo "Self update to version ${NEWVERSION} succeeded!" echo "Self update to version ${NEWVERSION} succeeded!"
export L3DVERSION=${NEWVERSION}
export L3D_FORCE_UPDATE=0
/usr/local/bin/reset
echo "" echo ""
echo "" echo ""
echo "" echo ""
echo "================================================================" echo "=================================================================="
echo "It's recommended to run" echo "The cleanup process only removes unused and outdated components."
echo "If you also want to update the components of your current projects"
echo "you need to run"
echo ""
echo -e " \\033[31m l3d reset \\033[0m"
echo "" echo ""
echo " l3d reset" echo "when the self-update has completed."
echo "=================================================================="
echo "" echo ""
echo "now, so that we can clean the legacy components properly." echo ""
echo "================================================================" echo ""
export L3DVERSION=${NEWVERSION}
export L3D_FORCE_UPDATE=0
/usr/local/bin/reset
...@@ -192,9 +192,9 @@ readEnv ...@@ -192,9 +192,9 @@ readEnv
# Validate PHP version # Validate PHP version
INSTALLED_PHP_VERSION=$(php -r "echo(substr(phpversion(),0,3));") INSTALLED_PHP_VERSION=$(php -r "echo(substr(phpversion(),0,3));")
if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then
echo -e "\\033[31m" ============================================= "\\033[0m" echo -e "\\033[31m ============================================= \\033[0m"
echo -e "\\033[31m" ERROR: PHP $INSTALLED_PHP_VERSION installed but $PHP_VERSION expected !!! "\\033[0m" echo -e "\\033[31m ERROR: PHP $INSTALLED_PHP_VERSION installed but $PHP_VERSION expected !!! \\033[0m"
echo -e "\\033[31m" ============================================= "\\033[0m" echo -e "\\033[31m ============================================= \\033[0m"
fi fi
if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then
composer self-update --1 composer self-update --1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment