Skip to content

Commit 7d75b6b

Browse files
yosifkityosifkit
authored
Merge pull request #626 from infosiftr/minor-enable-tweaks
Fix a few superficial issues with "docker-php-ext-enable"
2 parents 6a28b28 + f504394 commit 7d75b6b

32 files changed

+352
-128
lines changed

‎5.6/alpine3.4/cli/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/alpine3.4/fpm/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/alpine3.4/zts/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/jessie/apache/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/jessie/cli/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/jessie/fpm/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎5.6/jessie/zts/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎7.0/alpine3.4/cli/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

‎7.0/alpine3.4/fpm/docker-php-ext-enable

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

4-
cd "$(php -r 'echo ini_get("extension_dir");')"
4+
extDir="$(php -r 'echo ini_get("extension_dir");')"
5+
cd "$extDir"
56

67
usage() {
78
echo "usage: $0 [options] module-name [module-name ...]"
@@ -10,7 +11,12 @@ usage() {
1011
echo " $0 --ini-name 0-apc.ini apcu apc"
1112
echo
1213
echo 'Possible values for module-name:'
13-
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
find -maxdepth 1 \
15+
-type f \
16+
-name '*.so' \
17+
-exec basename '{}' ';' \
18+
| sort \
19+
| xargs
1420
echo
1521
echo 'Some of the above modules are already compiled into PHP; please check'
1622
echo 'the output of "php -i" to see which modules are already loaded.'
@@ -47,7 +53,7 @@ for module; do
4753
module="$module.so"
4854
fi
4955
if ! [ -f "$module" ]; then
50-
echo >&2 "error: $(readlink -f "$module") does not exist"
56+
echo >&2 "error: '$module' does not exist"
5157
echo >&2
5258
usage >&2
5359
exit 1
@@ -80,7 +86,8 @@ fi
8086
for module in $modules; do
8187
if readelf --wide --syms "$module" | grep -q ' zend_extension_entry$'; then
8288
# https://wiki.php.net/internals/extensions#loading_zend_extensions
83-
line="zend_extension=$(readlink -f "$module")"
89+
absModule="$(readlink -f "$module")"
90+
line="zend_extension=$absModule"
8491
else
8592
line="extension=$module"
8693
fi

0 commit comments

Comments
 (0)