diff --git a/Dockerfile b/Dockerfile index fdd96b5b764ed69b1511d355dbdb86a8a66f12fe..7d876e4e57379330105956bdb92e55300fa60754 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,6 +18,7 @@ ADD configIdea.sh /usr/local/bin/.configIdea ADD l3dComposer.php /usr/local/bin/.l3dComposer.php ADD run/scripts/info /usr/local/bin/l3d ADD run/scripts/version /usr/local/bin/version +ADD run/scripts/l3dnewversion /usr/local/bin/l3dnewversion RUN echo "Install dorgflow" && \ cd /var/opt && \ diff --git a/run/scripts/info b/run/scripts/info index 63879485e75725fd616208465add5aa312633663..d8024647c43f593c1e74397b254a2a4c55a10d07 100755 --- a/run/scripts/info +++ b/run/scripts/info @@ -26,9 +26,9 @@ function infol3d() { more .env fi else - 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" + 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 sectionFooter diff --git a/run/scripts/selfupdate b/run/scripts/selfupdate index ef93142f9b500fb037a800a2422f063dc56f6389..9c6be233ebeb0a28254f59c117d2e00056d697db 100755 --- a/run/scripts/selfupdate +++ b/run/scripts/selfupdate @@ -19,18 +19,22 @@ if [[ "$UPDATE" == *"setup:${NEWVERSION} not found"* ]]; then fi echo "Self update to version ${NEWVERSION} succeeded!" - -export L3DVERSION=${NEWVERSION} -export L3D_FORCE_UPDATE=0 -/usr/local/bin/reset - echo "" echo "" echo "" -echo "================================================================" -echo "It's recommended to run" +echo "==================================================================" +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 " l3d reset" +echo "when the self-update has completed." +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 diff --git a/start.sh b/start.sh index afb271dfa23fb601cb403052647191d2a02246d1..b9c668381c8b3bd65af057322b78a0a73ca823cc 100755 --- a/start.sh +++ b/start.sh @@ -192,9 +192,9 @@ readEnv # Validate PHP version INSTALLED_PHP_VERSION=$(php -r "echo(substr(phpversion(),0,3));") if [[ "$INSTALLED_PHP_VERSION" != "$PHP_VERSION" ]]; then - 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" ============================================= "\\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 ============================================= \\033[0m" fi if [[ "$COMPOSER_DOWNGRADE" == "1" ]]; then composer self-update --1