summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2008-12-07 22:12:17 -0600
committerDan McGee <dan@archlinux.org>2008-12-07 22:12:17 -0600
commitbd628274cc8db81704860e69894fcd217c2068d0 (patch)
tree0ca59deff11d9eff700494e727604903b60352b8
parent9ae7eb1292a42eb568fd982f32d3dca5b9794a2d (diff)
parent78cf32e194a1a58c6a7ee3d1c10623e668be71d6 (diff)
downloadpacman-bd628274cc8db81704860e69894fcd217c2068d0.tar.xz
Merge branch 'maint'
-rwxr-xr-xcontrib/pactree3
-rw-r--r--doc/PKGBUILD.5.txt2
-rw-r--r--doc/repo-add.8.txt4
-rw-r--r--scripts/makepkg.sh.in4
4 files changed, 8 insertions, 5 deletions
diff --git a/contrib/pactree b/contrib/pactree
index d9fa8b3b..df536717 100755
--- a/contrib/pactree
+++ b/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))
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt
index 081c35b3..e42a8b86 100644
--- a/doc/PKGBUILD.5.txt
+++ b/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
diff --git a/doc/repo-add.8.txt b/doc/repo-add.8.txt
index d3b85762..b9956e9b 100644
--- a/doc/repo-add.8.txt
+++ b/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
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 179746d2..94cb942e 100644
--- a/scripts/makepkg.sh.in
+++ b/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.")"