close #135

mautic · Nov 4, 2019 · dd30a12 · dd30a12
1 parent 32a80fa
commit dd30a12
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
@@ -86,7 +86,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
  echo "10,40 * * * * www-data php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
+if ! [ -e index.php -a -e app/AppKernel.php ]; then
  echo >&2 "Mautic not found in $(pwd) - copying now..."
 
  if [ "$(ls -A)" ]; then

diff --git a/beta-apache/docker-entrypoint.sh b/beta-apache/docker-entrypoint.sh
@@ -85,7 +85,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
  echo "10,40 * * * * www-data php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
+if ! [ -e index.php -a -e app/AppKernel.php ]; then
  echo >&2 "Mautic not found in $(pwd) - copying now..."
 
  if [ "$(ls -A)" ]; then

diff --git a/beta-fpm/docker-entrypoint.sh b/beta-fpm/docker-entrypoint.sh
@@ -85,7 +85,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
  echo "10,40 * * * * www-data php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
+if ! [ -e index.php -a -e app/AppKernel.php ]; then
  echo >&2 "Mautic not found in $(pwd) - copying now..."
 
  if [ "$(ls -A)" ]; then

diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
@@ -86,7 +86,7 @@ if [ -n "$MAUTIC_CRON_DYNAMICS" ]; then
  echo "10,40 * * * * www-data php /var/www/html/app/console mautic:integration:fetchleads -i Dynamics > /var/log/cron.pipe 2>&1" >> /etc/cron.d/mautic
 fi
 
-if ! [ -e index.php ] && [ -e app/AppKernel.php ]; then
+if ! [ -e index.php -a -e app/AppKernel.php ]; then
  echo >&2 "Mautic not found in $(pwd) - copying now..."
 
  if [ "$(ls -A)" ]; then