summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Brückner <marc@ma-br.de>2018-09-14 08:25:49 +0200
committerMarc Brückner <marc@ma-br.de>2018-09-14 08:25:49 +0200
commitbdc2d3e6103af64c284ebc849e4bcfd65446179e (patch)
treef3a85d4b5abf90b336f0c72fff44564fcfcdbf5f
parenta3cce50b00a4d0568f12de6043e797e803b95157 (diff)
fix regex for apache
-rwxr-xr-x12.0/apache/entrypoint.sh2
-rwxr-xr-x12.0/fpm-alpine/entrypoint.sh2
-rwxr-xr-x12.0/fpm/entrypoint.sh2
-rwxr-xr-x13.0/apache/entrypoint.sh2
-rwxr-xr-x13.0/fpm-alpine/entrypoint.sh2
-rwxr-xr-x13.0/fpm/entrypoint.sh2
-rwxr-xr-x14.0/apache/entrypoint.sh2
-rwxr-xr-x14.0/fpm-alpine/entrypoint.sh2
-rwxr-xr-x14.0/fpm/entrypoint.sh2
-rwxr-xr-xdocker-entrypoint.sh2
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