Skip to content

Commit cb622df

Browse files
tianontianon
authored
Merge pull request #497 from infosiftr/extra-explanation
Extra explanation in `docker-php-ext-*` scripts
2 parents d7bfdb5 + 8515b3c commit cb622df

File tree

87 files changed

+580
-203
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+580
-203
lines changed

‎5.6/alpine/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

‎5.6/alpine/docker-php-ext-enable

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/alpine/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/apache/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/apache/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

‎5.6/docker-php-ext-enable

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/fpm/alpine/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/fpm/alpine/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/fpm/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/fpm/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/zts/alpine/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/zts/alpine/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

‎5.6/zts/docker-php-ext-configure

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@ fi
1818

1919
cd /usr/src/php/ext
2020

21-
ext="$1"
22-
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
23-
echo >&2 "usage: $0 ext-name [configure flags]"
24-
echo >&2 " ie: $0 gd --with-jpeg-dir=/usr/local/something"
25-
echo >&2
26-
echo >&2 'Possible values for ext-name:'
27-
find /usr/src/php/ext \
21+
usage() {
22+
echo "usage: $0 ext-name [configure flags]"
23+
echo " ie: $0 gd --with-jpeg-dir=/usr/local/something"
24+
echo
25+
echo 'Possible values for ext-name:'
26+
find . \
2827
-mindepth 2 \
2928
-maxdepth 2 \
3029
-type f \
@@ -33,6 +32,14 @@ if [ -z "$ext" ] || [ ! -d "$ext" ]; then
3332
| xargs -n1 basename \
3433
| sort \
3534
| xargs
35+
echo
36+
echo 'Some of the above modules are already compiled into PHP; please check'
37+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
38+
}
39+
40+
ext="$1"
41+
if [ -z "$ext" ] || [ ! -d "$ext" ]; then
42+
usage >&2
3643
exit 1
3744
fi
3845
shift

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ usage() {
1111
echo
1212
echo 'Possible values for module-name:'
1313
echo $(find -maxdepth 1 -type f -name '*.so' -exec basename '{}' ';' | sort)
14+
echo
15+
echo 'Some of the above modules are already compiled into PHP; please check'
16+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
1417
}
1518

1619
opts="$(getopt -o 'h?' --long 'help,ini-name:' -- "$@" || { usage >&2 && false; })"

‎5.6/zts/docker-php-ext-install

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,9 @@ usage() {
3636
| xargs -n1 basename \
3737
| sort \
3838
| xargs
39+
echo
40+
echo 'Some of the above modules are already compiled into PHP; please check'
41+
echo 'the ouptut of "php -i" to see which modules are already loaded.'
3942
}
4043

4144
opts="$(getopt -o 'h?j:' --long 'help,jobs:' -- "$@" || { usage >&2 && false; })"

0 commit comments

Comments
 (0)