From bdc2d3e6103af64c284ebc849e4bcfd65446179e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Br=C3=BCckner?= Date: Fri, 14 Sep 2018 08:25:49 +0200 Subject: [PATCH] fix regex for apache --- 12.0/apache/entrypoint.sh | 2 +- 12.0/fpm-alpine/entrypoint.sh | 2 +- 12.0/fpm/entrypoint.sh | 2 +- 13.0/apache/entrypoint.sh | 2 +- 13.0/fpm-alpine/entrypoint.sh | 2 +- 13.0/fpm/entrypoint.sh | 2 +- 14.0/apache/entrypoint.sh | 2 +- 14.0/fpm-alpine/entrypoint.sh | 2 +- 14.0/fpm/entrypoint.sh | 2 +- docker-entrypoint.sh | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/12.0/apache/entrypoint.sh b/12.0/apache/entrypoint.sh index dd019a84..8e748971 100755 --- a/12.0/apache/entrypoint.sh +++ b/12.0/apache/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/12.0/fpm-alpine/entrypoint.sh b/12.0/fpm-alpine/entrypoint.sh index dd019a84..8e748971 100755 --- a/12.0/fpm-alpine/entrypoint.sh +++ b/12.0/fpm-alpine/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/12.0/fpm/entrypoint.sh b/12.0/fpm/entrypoint.sh index dd019a84..8e748971 100755 --- a/12.0/fpm/entrypoint.sh +++ b/12.0/fpm/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh index dd019a84..8e748971 100755 --- a/13.0/apache/entrypoint.sh +++ b/13.0/apache/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh index dd019a84..8e748971 100755 --- a/13.0/fpm-alpine/entrypoint.sh +++ b/13.0/fpm-alpine/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh index dd019a84..8e748971 100755 --- a/13.0/fpm/entrypoint.sh +++ b/13.0/fpm/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh index dd019a84..8e748971 100755 --- a/14.0/apache/entrypoint.sh +++ b/14.0/apache/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh index dd019a84..8e748971 100755 --- a/14.0/fpm-alpine/entrypoint.sh +++ b/14.0/fpm-alpine/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh index dd019a84..8e748971 100755 --- a/14.0/fpm/entrypoint.sh +++ b/14.0/fpm/entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016 diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index dd019a84..8e748971 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -19,7 +19,7 @@ run_as() { fi } -if expr "$1" : "apache*" 1>/dev/null || [ "$1" = "php-fpm" ]; then +if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ]; then installed_version="0.0.0.0" if [ -f /var/www/html/version.php ]; then # shellcheck disable=SC2016