Update all variants via ./update.sh

Author: tianon

5.6/alpine/docker-php-ext-configure

@@ -10,9 +10,10 @@ if [ -z "$srcExists" ]; then
 	touch /usr/src/php/.docker-delete-me
 fi
 
+cd /usr/src/php/ext
+
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || [ ! -d "$extDir" ]; then
+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
@@ -46,6 +47,6 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 set -x
-cd "$extDir"
+cd "$ext"
 phpize
 ./configure "$@"

5.6/alpine/docker-php-ext-install

@@ -89,8 +89,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+popDir="$PWD"
 for ext in $exts; do
-	(
 		cd "$ext"
 		[ -e Makefile ] || docker-php-ext-configure "$ext"
 		make -j"$j"
@@ -101,7 +101,7 @@ for ext in $exts; do
 			-exec basename '{}' ';' \
 				| xargs -r docker-php-ext-enable
 		make -j"$j" clean
-	)
+		cd "$popDir"
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then

5.6/apache/docker-php-ext-configure

@@ -10,9 +10,10 @@ if [ -z "$srcExists" ]; then
 	touch /usr/src/php/.docker-delete-me
 fi
 
+cd /usr/src/php/ext
+
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || [ ! -d "$extDir" ]; then
+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
@@ -46,6 +47,6 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 set -x
-cd "$extDir"
+cd "$ext"
 phpize
 ./configure "$@"

5.6/apache/docker-php-ext-install

@@ -89,8 +89,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+popDir="$PWD"
 for ext in $exts; do
-	(
 		cd "$ext"
 		[ -e Makefile ] || docker-php-ext-configure "$ext"
 		make -j"$j"
@@ -101,7 +101,7 @@ for ext in $exts; do
 			-exec basename '{}' ';' \
 				| xargs -r docker-php-ext-enable
 		make -j"$j" clean
-	)
+		cd "$popDir"
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then

5.6/docker-php-ext-configure

@@ -10,9 +10,10 @@ if [ -z "$srcExists" ]; then
 	touch /usr/src/php/.docker-delete-me
 fi
 
+cd /usr/src/php/ext
+
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || [ ! -d "$extDir" ]; then
+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
@@ -46,6 +47,6 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 set -x
-cd "$extDir"
+cd "$ext"
 phpize
 ./configure "$@"

5.6/docker-php-ext-install

@@ -89,8 +89,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+popDir="$PWD"
 for ext in $exts; do
-	(
 		cd "$ext"
 		[ -e Makefile ] || docker-php-ext-configure "$ext"
 		make -j"$j"
@@ -101,7 +101,7 @@ for ext in $exts; do
 			-exec basename '{}' ';' \
 				| xargs -r docker-php-ext-enable
 		make -j"$j" clean
-	)
+		cd "$popDir"
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then

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

@@ -10,9 +10,10 @@ if [ -z "$srcExists" ]; then
 	touch /usr/src/php/.docker-delete-me
 fi
 
+cd /usr/src/php/ext
+
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || [ ! -d "$extDir" ]; then
+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
@@ -46,6 +47,6 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 set -x
-cd "$extDir"
+cd "$ext"
 phpize
 ./configure "$@"

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

@@ -89,8 +89,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+popDir="$PWD"
 for ext in $exts; do
-	(
 		cd "$ext"
 		[ -e Makefile ] || docker-php-ext-configure "$ext"
 		make -j"$j"
@@ -101,7 +101,7 @@ for ext in $exts; do
 			-exec basename '{}' ';' \
 				| xargs -r docker-php-ext-enable
 		make -j"$j" clean
-	)
+		cd "$popDir"
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then

5.6/fpm/docker-php-ext-configure

@@ -10,9 +10,10 @@ if [ -z "$srcExists" ]; then
 	touch /usr/src/php/.docker-delete-me
 fi
 
+cd /usr/src/php/ext
+
 ext="$1"
-extDir="/usr/src/php/ext/$ext"
-if [ -z "$ext" ] || [ ! -d "$extDir" ]; then
+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
@@ -46,6 +47,6 @@ if [ "$pm" = 'apk' ]; then
 fi
 
 set -x
-cd "$extDir"
+cd "$ext"
 phpize
 ./configure "$@"

5.6/fpm/docker-php-ext-install

@@ -89,8 +89,8 @@ if [ "$pm" = 'apk' ]; then
 	fi
 fi
 
+popDir="$PWD"
 for ext in $exts; do
-	(
 		cd "$ext"
 		[ -e Makefile ] || docker-php-ext-configure "$ext"
 		make -j"$j"
@@ -101,7 +101,7 @@ for ext in $exts; do
 			-exec basename '{}' ';' \
 				| xargs -r docker-php-ext-enable
 		make -j"$j" clean
-	)
+		cd "$popDir"
 done
 
 if [ "$pm" = 'apk' ] && [ -n "$apkDel" ]; then