From c7a848cc377c939fae2b147fc441eeacad123b32 Mon Sep 17 00:00:00 2001 From: Joe Ferguson Date: Tue, 19 Sep 2017 15:43:41 -0700 Subject: [PATCH] Explain that some modules listed in `docker-php-ext-*` scripts are already compiled in --- docker-php-ext-configure | 21 ++++++++++++++------- docker-php-ext-enable | 3 +++ docker-php-ext-install | 3 +++ 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/docker-php-ext-configure b/docker-php-ext-configure index 375afd40..f97bb2b9 100755 --- a/docker-php-ext-configure +++ b/docker-php-ext-configure @@ -18,13 +18,12 @@ fi cd /usr/src/php/ext -ext="$1" -if [ -z "$ext" ] || [ ! -d "$ext" ]; then - echo >&2 "usage: $0 ext-name [configure flags]" - echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something" - echo >&2 - echo >&2 'Possible values for ext-name:' - find /usr/src/php/ext \ +usage() { + echo "usage: $0 ext-name [configure flags]" + echo " ie: $0 gd --with-jpeg-dir=/usr/local/something" + echo + echo 'Possible values for ext-name:' + find . \ -mindepth 2 \ -maxdepth 2 \ -type f \ @@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then | xargs -n1 basename \ | sort \ | xargs + echo + echo 'Some of the above modules are already compiled into PHP; please check' + echo 'the ouptut of "php -i" to see which modules are already loaded.' +} + +ext="$1" +if [ -z "$ext" ] || [ ! -d "$ext" ]; then + usage >&2 exit 1 fi shift diff --git a/docker-php-ext-enable b/docker-php-ext-enable index 0acb79df..08f1c25f 100755 --- a/docker-php-ext-enable +++ b/docker-php-ext-enable @@ -11,6 +11,9 @@ usage() { echo echo 'Possible values for module-name:' echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort) + echo + echo 'Some of the above modules are already compiled into PHP; please check' + echo 'the ouptut of "php -i" to see which modules are already loaded.' } opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })" diff --git a/docker-php-ext-install b/docker-php-ext-install index c0660230..2847ecac 100755 --- a/docker-php-ext-install +++ b/docker-php-ext-install @@ -36,6 +36,9 @@ usage() { | xargs -n1 basename \ | sort \ | xargs + echo + echo 'Some of the above modules are already compiled into PHP; please check' + echo 'the ouptut of "php -i" to see which modules are already loaded.' } opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"