Merge branch 'maint'

contrib/pactree

@@ -208,11 +208,10 @@ for (( n=0 ; n < $len_options ; n++ )); do
 		continue
 	fi
 
-	if [[ "${options[$n]}" =~ -d[[:digit:]]* || "${options[$n]}" == "--depth" ]]; then
+	if [[ "${options[$n]}" =~ -d[[:digit:]]+ || "${options[$n]}" == "--depth" ]]; then
 		if [[ "${options[$n]#-d}" =~ [[:digit:]]+ ]]; then
 			max_depth="${options[$n]#-d}"
 		elif [[ ${options[$((n+1))]} =~ [[:digit:]]+ ]]; then
-#		if [ ${options[$((n+1))]} -eq ${options[$((n+1))]} 2>/dev/null ]; then
 			max_depth="${options[$((n+1))]}"
 			unset options[$((n+1))]
 			((++n))

doc/PKGBUILD.5.txt

@@ -90,7 +90,7 @@ similar to `$_basekernver`.
 +
 It is also possible to specify an optional filename, which is helpful
 with weird URLs and for handling multiple source files with the same
-name. The syntax is: `source=('filename::url')`
+name. The syntax is: `$$source=('filename::url')$$`
 
 *noextract (array)*::
 	An array of filenames corresponding to those from the source array. Files

doc/repo-add.8.txt

@@ -16,9 +16,9 @@ repo-add - package database maintenance utility
 
 Synopsis
 --------
-repo-add [-q] <path-to-db> <package> ...
+repo-add [-q] <path-to-db> <package1> [<package2> ...]
 
-repo-remove [-q] <path-to-db> <packagename> ...
+repo-remove [-q] <path-to-db> <packagename> [<packagename2> ...]
 
 
 Description

scripts/makepkg.sh.in

@@ -673,6 +673,8 @@ run_build() {
 
 	# ensure all necessary build variables are exported
 	export CFLAGS CXXFLAGS MAKEFLAGS CHOST
+	# save our shell options so build() can't override what we need
+	local shellopts=$(shopt -p)
 
 	local ret=0
 	if [ "$LOGGING" = "1" ]; then
@@ -693,6 +695,8 @@ run_build() {
 	else
 		build 2>&1 || ret=$?
 	fi
+	# reset our shell options
+	eval "$shellopts"
 
 	if [ $ret -gt 0 ]; then
 		error "$(gettext "Build Failed.")"