diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/12.0/apache/entrypoint.sh +++ b/12.0/apache/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/12.0/fpm-alpine/entrypoint.sh +++ b/12.0/fpm-alpine/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/12.0/fpm/entrypoint.sh +++ b/12.0/fpm/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root" diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index ff0977c6..bc96fd79 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -34,10 +34,11 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then fi if version_greater "$image_version" "$installed_version"; then - echo -n "Initializing version $image_version ... " if [ "$installed_version" != "0.0.0.0" ]; then - echo -ne "\nRunning upgrade from $installed_version ... " + echo -n "Running upgrade from $installed_version to $image_version ... " run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before + else + echo "Initializing new instance with version $image_version ... " fi if [ "$(id -u)" = 0 ]; then rsync_options="-rlDog --chown www-data:root"