Skip to content

Commit ba478b0

Browse files
tianontianon
authored
Merge pull request #324 from tarrenj/master
Update docker-entrypoint.sh
2 parents b4038d4 + d640173 commit ba478b0

File tree

13 files changed

+13
-13
lines changed

13 files changed

+13
-13
lines changed

‎docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php5.6/apache/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php5.6/fpm-alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php5.6/fpm/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.0/apache/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.0/fpm-alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.0/fpm/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.1/apache/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.1/fpm-alpine/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

‎php7.1/fpm/docker-entrypoint.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
4040
group="$(id -g)"
4141
fi
4242

43-
if ! [ -e index.php -a -e wp-includes/version.php ]; then
43+
if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then
4444
echo >&2 "WordPress not found in $PWD - copying now..."
4545
if [ "$(ls -A)" ]; then
4646
echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"

0 commit comments

Comments
 (0)