Adapt installation check to Joomla v3.8.x

joomla-docker · Oct 28, 2017 · 43e546e · 43e546e
1 parent ba24a37
commit 43e546e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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