Skip to content
This repository was archived by the owner on Oct 3, 2024. It is now read-only.

Commit 5be0e15

Browse files
committed
Use non-bash compatible syntax
1 parent c0d210b commit 5be0e15

File tree

10 files changed

+35
-64
lines changed

10 files changed

+35
-64
lines changed

cli/conf/composer/init.d/101-composer-run_composer_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/sh
22

3-
if [[ ! -z "${COMPOSER_AUTO_INSTALL}" ]] && [[ "${COMPOSER_AUTO_INSTALL}" = 1 ]]; then
3+
if [ ! -z "${COMPOSER_AUTO_INSTALL}" ] && [ "${COMPOSER_AUTO_INSTALL}" = 1 ]; then
44
composer install \
55
-a \
66
--prefer-dist \
77
--no-suggest
88
fi
99

10-
if [[ ! -z "${USER_ID}" ]] ; then
10+
if [ ! -z "${USER_ID}" ] ; then
1111
echo "USER_ID specified: ${USER_ID}"
1212
echo "Changing ownership of the vendor directory"
1313

cli/conf/xdebug/init.d/201-xdebug-setup_ini_file.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
HOST_IP=$(ip route show default | awk '/default/ {print $3}')
44

5-
[[ -z "${XDEBUG_EXTENSION_PATH}" ]] && XDEBUG_EXTENSION_PATH="xdebug.so"
5+
[ -z "${XDEBUG_EXTENSION_PATH}" ] && XDEBUG_EXTENSION_PATH="xdebug.so"
66

7-
[[ -z "${XDEBUG_MODE}" ]] && XDEBUG_MODE="debug"
8-
[[ -z "${XDEBUG_START_WITH_REQUEST}" ]] && XDEBUG_START_WITH_REQUEST="0"
9-
[[ -z "${XDEBUG_CLIENT_PORT}" ]] && XDEBUG_CLIENT_PORT="9003"
10-
[[ -z "${XDEBUG_REMOTE_HANDLER}" ]] && XDEBUG_REMOTE_HANDLER="dbgp"
11-
[[ -z "${XDEBUG_DISCOVER_CLIENT_HOST}" ]] && XDEBUG_DISCOVER_CLIENT_HOST="0"
12-
[[ -z "${XDEBUG_CLIENT_HOST}" ]] && XDEBUG_CLIENT_HOST="${HOST_IP}"
7+
[ -z "${XDEBUG_MODE}" ] && XDEBUG_MODE="debug"
8+
[ -z "${XDEBUG_START_WITH_REQUEST}" ] && XDEBUG_START_WITH_REQUEST="0"
9+
[ -z "${XDEBUG_CLIENT_PORT}" ] && XDEBUG_CLIENT_PORT="9003"
10+
[ -z "${XDEBUG_REMOTE_HANDLER}" ] && XDEBUG_REMOTE_HANDLER="dbgp"
11+
[ -z "${XDEBUG_DISCOVER_CLIENT_HOST}" ] && XDEBUG_DISCOVER_CLIENT_HOST="0"
12+
[ -z "${XDEBUG_CLIENT_HOST}" ] && XDEBUG_CLIENT_HOST="${HOST_IP}"
1313

14-
[[ -z "${XDEBUG_IDEKEY}" ]] && XDEBUG_IDEKEY="docker"
14+
[ -z "${XDEBUG_IDEKEY}" ] && XDEBUG_IDEKEY="docker"
1515

16-
[[ -z "${XDEBUG_OUTPUT_DIR}" ]] && XDEBUG_OUTPUT_DIR="/tmp"
17-
[[ -z "${XDEBUG_PROFILER_OUTPUT_NAME}" ]] && XDEBUG_PROFILER_OUTPUT_NAME="cachegrind.out.%p-%H-%R"
16+
[ -z "${XDEBUG_OUTPUT_DIR}" ] && XDEBUG_OUTPUT_DIR="/tmp"
17+
[ -z "${XDEBUG_PROFILER_OUTPUT_NAME}" ] && XDEBUG_PROFILER_OUTPUT_NAME="cachegrind.out.%p-%H-%R"
1818

1919
sed -e "
2020
s/%xdebug_extension_path%/${XDEBUG_EXTENSION_PATH}/g

cli/init.d/001-change_user_uid.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
if [[ ! -z "${USER_ID}" ]] ; then
3+
if [ ! -z "${USER_ID}" ] ; then
44
echo "USER_ID specified: ${USER_ID}"
55

66
if id www-data >/dev/null 2>&1; then

fpm/conf/composer/init.d/101-composer-run_composer_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
#!/bin/sh
22

3-
if [[ ! -z "${COMPOSER_AUTO_INSTALL}" ]] && [[ "${COMPOSER_AUTO_INSTALL}" = 1 ]]; then
3+
if [ ! -z "${COMPOSER_AUTO_INSTALL}" ] && [ "${COMPOSER_AUTO_INSTALL}" = 1 ]; then
44
composer install \
55
-a \
66
--prefer-dist \
77
--no-suggest
88
fi
99

10-
if [[ ! -z "${FPM_USER_ID}" ]] ; then
10+
if [ ! -z "${FPM_USER_ID}" ] ; then
1111
echo "FPM_USER_ID specified: ${FPM_USER_ID}"
1212
echo "Changing ownership of the vendor directory"
1313

fpm/conf/fpm/init.d/001-fpm-change_user_uid.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/bin/sh
22

3-
if [[ ! -z "${UID}" ]] ; then
3+
if [ ! -z "${UID}" ] ; then
44
echo "Warning: UID env variable has been deprecated and will be removed in future releases. Use FPM_USER_ID instead."
55

66
FPM_USER_ID="${UID}"
77
fi
88

9-
if [[ ! -z "${FPM_USER_ID}" ]] ; then
9+
if [ ! -z "${FPM_USER_ID}" ] ; then
1010
echo "FPM_USER_ID specified: ${FPM_USER_ID}"
1111

1212
if id www-data >/dev/null 2>&1; then
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
[[ -z "${FPM_ERROR_LOG_DIR}" ]] && FPM_ERROR_LOG_DIR="/dev/stderr"
3+
[ -z "${FPM_ERROR_LOG_DIR}" ] && FPM_ERROR_LOG_DIR="/dev/stderr"
44

55
sed -i -e "s#%fpm_error_log_dir%#${FPM_ERROR_LOG_DIR}#g" \
66
/usr/local/etc/php/php-fpm.conf

fpm/conf/fpm/init.d/004-fpm-set_root_dir.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/sh
22

3-
[[ -z "${APP_DIR}" ]] && APP_DIR="/var/www"
4-
[[ -z "${FPM_ROOT_DIR}" ]] && FPM_ROOT_DIR="public"
3+
[ -z "${APP_DIR}" ] && APP_DIR="/var/www"
4+
[ -z "${FPM_ROOT_DIR}" ] && FPM_ROOT_DIR="public"
55

66
sed -i -e "s#%fpm_root_dir%#${APP_DIR}/${FPM_ROOT_DIR}#g" \
77
/usr/local/etc/php/php.ini \

fpm/conf/fpm/init.d/005-fpm-set_www_conf_values.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/sh
22

3-
[[ -z "${WWW_POOL_NAME}" ]] && WWW_POOL_NAME="www"
4-
[[ -z "${WWW_USER}" ]] && WWW_USER="www-data"
5-
[[ -z "${WWW_GROUP}" ]] && WWW_GROUP="www-data"
3+
[ -z "${WWW_POOL_NAME}" ] && WWW_POOL_NAME="www"
4+
[ -z "${WWW_USER}" ] && WWW_USER="www-data"
5+
[ -z "${WWW_GROUP}" ] && WWW_GROUP="www-data"
66

7-
[[ -z "${FPM_PORT}" ]] && FPM_PORT="9000"
8-
[[ -z "${FPM_ACCESS_LOG}" ]] && FPM_ACCESS_LOG="/dev/stdout"
7+
[ -z "${FPM_PORT}" ] && FPM_PORT="9000"
8+
[ -z "${FPM_ACCESS_LOG}" ] && FPM_ACCESS_LOG="/dev/stdout"
99

1010
sed -i -e "
1111
s#%www_pool_name%#${WWW_POOL_NAME}#g

fpm/conf/xdebug/init.d/201-xdebug-setup_ini_file.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,19 @@
22

33
HOST_IP=$(ip route show default | awk '/default/ {print $3}')
44

5-
[[ -z "${XDEBUG_EXTENSION_PATH}" ]] && XDEBUG_EXTENSION_PATH="xdebug.so"
5+
[ -z "${XDEBUG_EXTENSION_PATH}" ] && XDEBUG_EXTENSION_PATH="xdebug.so"
66

7-
[[ -z "${XDEBUG_MODE}" ]] && XDEBUG_MODE="debug"
8-
[[ -z "${XDEBUG_START_WITH_REQUEST}" ]] && XDEBUG_START_WITH_REQUEST="0"
9-
[[ -z "${XDEBUG_CLIENT_PORT}" ]] && XDEBUG_CLIENT_PORT="9003"
10-
[[ -z "${XDEBUG_REMOTE_HANDLER}" ]] && XDEBUG_REMOTE_HANDLER="dbgp"
11-
[[ -z "${XDEBUG_DISCOVER_CLIENT_HOST}" ]] && XDEBUG_DISCOVER_CLIENT_HOST="0"
12-
[[ -z "${XDEBUG_CLIENT_HOST}" ]] && XDEBUG_CLIENT_HOST="${HOST_IP}"
7+
[ -z "${XDEBUG_MODE}" ] && XDEBUG_MODE="debug"
8+
[ -z "${XDEBUG_START_WITH_REQUEST}" ] && XDEBUG_START_WITH_REQUEST="0"
9+
[ -z "${XDEBUG_CLIENT_PORT}" ] && XDEBUG_CLIENT_PORT="9003"
10+
[ -z "${XDEBUG_REMOTE_HANDLER}" ] && XDEBUG_REMOTE_HANDLER="dbgp"
11+
[ -z "${XDEBUG_DISCOVER_CLIENT_HOST}" ] && XDEBUG_DISCOVER_CLIENT_HOST="0"
12+
[ -z "${XDEBUG_CLIENT_HOST}" ] && XDEBUG_CLIENT_HOST="${HOST_IP}"
1313

14-
[[ -z "${XDEBUG_IDEKEY}" ]] && XDEBUG_IDEKEY="docker"
14+
[ -z "${XDEBUG_IDEKEY}" ] && XDEBUG_IDEKEY="docker"
1515

16-
[[ -z "${XDEBUG_OUTPUT_DIR}" ]] && XDEBUG_OUTPUT_DIR="/tmp"
17-
[[ -z "${XDEBUG_PROFILER_OUTPUT_NAME}" ]] && XDEBUG_PROFILER_OUTPUT_NAME="cachegrind.out.%p-%H-%R"
16+
[ -z "${XDEBUG_OUTPUT_DIR}" ] && XDEBUG_OUTPUT_DIR="/tmp"
17+
[ -z "${XDEBUG_PROFILER_OUTPUT_NAME}" ] && XDEBUG_PROFILER_OUTPUT_NAME="cachegrind.out.%p-%H-%R"
1818

1919
sed -e "
2020
s/%xdebug_extension_path%/${XDEBUG_EXTENSION_PATH}/g

fpm/docker-entrypoint.sh

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)