common: expand_destdir rewrite

common/environment/install/extglob.sh

@@ -1,15 +1,18 @@
 # This provides the extglob function to expand wildcards in the destdir
 
 expand_destdir() {
-	local glob_list= result= glob= file=
+	local result= glob= file=
 
-	for glob; do
+	(
-		glob_list+=" $DESTDIR/$glob"
+		set -f
-	done
+		for glob in $@; do
-	shopt -s extglob
+			files=$(echo "${PKGDESTDIR}/${glob}")
-	for file in $glob_list; do
+			set +f
-		result+=" ${file#$DESTDIR/}"
+			for file in $files; do
-	done
+				result+="${blank}${file#$PKGDESTDIR/}"
-	shopt -u extglob
+				blank=" "
-	echo $result
+			done
+		done
+		echo "$result"
+	)
 }

common/hooks/do-pkg/00-gen-pkg.sh

@@ -50,7 +50,7 @@ genpkg() {
 	local _replaces="$(echo $replaces)"
 	local _reverts="$(echo $reverts)"
 	local _mutable_files="$(echo $mutable_files)"
-	local _conf_files="$(expand_destdir $conf_files)"
+	local _conf_files="$(expand_destdir "$conf_files")"
 	local _alternatives="$(echo $alternatives)"
 	local _tags="$(echo $tags)"
 

common/hooks/pre-pkg/99-pkglint.sh

@@ -25,7 +25,7 @@ hook() {
 	done
 
 	# Check that configuration files really exist.
-	for f in $(expand_destdir ${conf_files}); do
+	for f in $(expand_destdir "${conf_files}"); do
 		if [ ! -f "${PKGDESTDIR}/${f}" ]; then
 			msg_red "${pkgver}: '$f' configuration file not in PKGDESTDIR!\n"
 			error=1