From 2c60810e14fce42b831a44dcc75eda3d7e9427cf Mon Sep 17 00:00:00 2001 From: Jake Tarren Date: Thu, 9 Aug 2018 17:13:37 -0400 Subject: [PATCH 1/2] Remove depreciated file operator in favor of . Signed-off-by: Jake Tarren --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 66726a0ea2..48679f8619 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" From d640173bd9648c2efc2f9d9df8ae43def949a1b6 Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 10 Aug 2018 08:00:21 -0700 Subject: [PATCH 2/2] Apply "update.sh" --- docker-entrypoint.sh | 2 +- php5.6/apache/docker-entrypoint.sh | 2 +- php5.6/fpm-alpine/docker-entrypoint.sh | 2 +- php5.6/fpm/docker-entrypoint.sh | 2 +- php7.0/apache/docker-entrypoint.sh | 2 +- php7.0/fpm-alpine/docker-entrypoint.sh | 2 +- php7.0/fpm/docker-entrypoint.sh | 2 +- php7.1/apache/docker-entrypoint.sh | 2 +- php7.1/fpm-alpine/docker-entrypoint.sh | 2 +- php7.1/fpm/docker-entrypoint.sh | 2 +- php7.2/apache/docker-entrypoint.sh | 2 +- php7.2/fpm-alpine/docker-entrypoint.sh | 2 +- php7.2/fpm/docker-entrypoint.sh | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 48679f8619..3fb9374875 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php5.6/apache/docker-entrypoint.sh b/php5.6/apache/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php5.6/apache/docker-entrypoint.sh +++ b/php5.6/apache/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php5.6/fpm-alpine/docker-entrypoint.sh b/php5.6/fpm-alpine/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php5.6/fpm-alpine/docker-entrypoint.sh +++ b/php5.6/fpm-alpine/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php5.6/fpm/docker-entrypoint.sh b/php5.6/fpm/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php5.6/fpm/docker-entrypoint.sh +++ b/php5.6/fpm/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.0/apache/docker-entrypoint.sh b/php7.0/apache/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.0/apache/docker-entrypoint.sh +++ b/php7.0/apache/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.0/fpm-alpine/docker-entrypoint.sh b/php7.0/fpm-alpine/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.0/fpm-alpine/docker-entrypoint.sh +++ b/php7.0/fpm-alpine/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.0/fpm/docker-entrypoint.sh b/php7.0/fpm/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.0/fpm/docker-entrypoint.sh +++ b/php7.0/fpm/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.1/apache/docker-entrypoint.sh b/php7.1/apache/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.1/apache/docker-entrypoint.sh +++ b/php7.1/apache/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.1/fpm-alpine/docker-entrypoint.sh b/php7.1/fpm-alpine/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.1/fpm-alpine/docker-entrypoint.sh +++ b/php7.1/fpm-alpine/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.1/fpm/docker-entrypoint.sh b/php7.1/fpm/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.1/fpm/docker-entrypoint.sh +++ b/php7.1/fpm/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.2/apache/docker-entrypoint.sh b/php7.2/apache/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.2/apache/docker-entrypoint.sh +++ b/php7.2/apache/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.2/fpm-alpine/docker-entrypoint.sh b/php7.2/fpm-alpine/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.2/fpm-alpine/docker-entrypoint.sh +++ b/php7.2/fpm-alpine/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!" diff --git a/php7.2/fpm/docker-entrypoint.sh b/php7.2/fpm/docker-entrypoint.sh index 66726a0ea2..3fb9374875 100755 --- a/php7.2/fpm/docker-entrypoint.sh +++ b/php7.2/fpm/docker-entrypoint.sh @@ -40,7 +40,7 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then group="$(id -g)" fi - if ! [ -e index.php -a -e wp-includes/version.php ]; then + if [ ! -e index.php ] && [ ! -e wp-includes/version.php ]; then echo >&2 "WordPress not found in $PWD - copying now..." if [ "$(ls -A)" ]; then echo >&2 "WARNING: $PWD is not empty - press Ctrl+C now if this is an error!"