From 43e546ea66a359b8e7b10213fae5d8e30bf5df16 Mon Sep 17 00:00:00 2001 From: Tim Ebert Date: Sat, 28 Oct 2017 15:22:02 +0200 Subject: [PATCH] Adapt installation check to Joomla v3.8.x --- apache-php7/docker-entrypoint.sh | 2 +- apache/docker-entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- fpm-php7/docker-entrypoint.sh | 2 +- fpm/docker-entrypoint.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apache-php7/docker-entrypoint.sh b/apache-php7/docker-entrypoint.sh index b0c1f74..8ac32f0 100755 --- a/apache-php7/docker-entrypoint.sh +++ b/apache-php7/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then exit 1 fi - if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + if ! [ -e index.php -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then echo >&2 "Joomla not found in $(pwd) - copying now..." if [ "$(ls -A)" ]; then diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh index b0c1f74..8ac32f0 100755 --- a/apache/docker-entrypoint.sh +++ b/apache/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then exit 1 fi - if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + if ! [ -e index.php -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then echo >&2 "Joomla not found in $(pwd) - copying now..." if [ "$(ls -A)" ]; then diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b0c1f74..8ac32f0 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then exit 1 fi - if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + if ! [ -e index.php -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then echo >&2 "Joomla not found in $(pwd) - copying now..." if [ "$(ls -A)" ]; then diff --git a/fpm-php7/docker-entrypoint.sh b/fpm-php7/docker-entrypoint.sh index b0c1f74..8ac32f0 100755 --- a/fpm-php7/docker-entrypoint.sh +++ b/fpm-php7/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then exit 1 fi - if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + if ! [ -e index.php -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then echo >&2 "Joomla not found in $(pwd) - copying now..." if [ "$(ls -A)" ]; then diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh index b0c1f74..8ac32f0 100755 --- a/fpm/docker-entrypoint.sh +++ b/fpm/docker-entrypoint.sh @@ -35,7 +35,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then exit 1 fi - if ! [ -e index.php -a -e libraries/cms/version/version.php ]; then + if ! [ -e index.php -a \( -e libraries/cms/version/version.php -o -e libraries/src/Version.php \) ]; then echo >&2 "Joomla not found in $(pwd) - copying now..." if [ "$(ls -A)" ]; then