summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorAllan McRae <allan@archlinux.org>2013-05-07 12:59:44 +1000
committerAllan McRae <allan@archlinux.org>2013-05-07 12:59:44 +1000
commit0f988beff8794338485352dc1beafbfcdbb20db1 (patch)
treee673c51058bddede4ef7f054e79c8ae799809628 /contrib
parentc5716d0e72e47c8cd2ca1a437598eeee54111754 (diff)
parenta4a7336dff8155cfeb37341d1e9e56092439bae6 (diff)
downloadpacman-0f988beff8794338485352dc1beafbfcdbb20db1.tar.xz
Merge branch 'maint'
Diffstat (limited to 'contrib')
-rw-r--r--contrib/checkupdates.sh.in2
-rw-r--r--contrib/paccache.sh.in4
-rw-r--r--contrib/zsh_completion.in14
3 files changed, 13 insertions, 7 deletions
diff --git a/contrib/checkupdates.sh.in b/contrib/checkupdates.sh.in
index 15950e13..9244d85a 100644
--- a/contrib/checkupdates.sh.in
+++ b/contrib/checkupdates.sh.in
@@ -36,7 +36,7 @@ eval $(awk -F' *= *' '$1 ~ /DBPath/ { print $1 "=" $2 }' /etc/pacman.conf)
mkdir -p "$CHECKUPDATE_DB"
ln -s "${DBPath}/local" "$CHECKUPDATE_DB" &> /dev/null
-fakeroot pacman -Sy --dbpath "$CHECKUPDATE_DB" &> /dev/null
+fakeroot pacman -Sy --dbpath "$CHECKUPDATE_DB" --logfile /dev/null &> /dev/null
pacman -Qqu --dbpath "$CHECKUPDATE_DB" 2> /dev/null
exit 0
diff --git a/contrib/paccache.sh.in b/contrib/paccache.sh.in
index c3312733..64c3c536 100644
--- a/contrib/paccache.sh.in
+++ b/contrib/paccache.sh.in
@@ -308,9 +308,9 @@ totalsaved=$(@SIZECMD@ "${candidates[@]}" | awk '{ sum += $1 } END { print sum }
# crush. kill. destroy.
(( verbose )) && cmdopts+=(-v)
if (( delete )); then
- printf '%s\0' "${candidates[@]}" | runcmd xargs -0 rm "${cmdopts[@]}"
+ runcmd xargs -0a <(printf '%s\0' "${candidates[@]}") rm "${cmdopts[@]}"
elif (( move )); then
- printf '%s\0' "${candidates[@]}" | runcmd xargs -0 mv "${cmdopts[@]}" -t "$movedir"
+ runcmd xargs -0a <(printf '%s\0' "${candidates[@]}") mv "${cmdopts[@]}" -t "$movedir"
fi
summarize "$pkgcount" "${candidates[@]}"
diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in
index c1fe0412..67aa40a7 100644
--- a/contrib/zsh_completion.in
+++ b/contrib/zsh_completion.in
@@ -202,7 +202,7 @@ _pacman_action_sync() {
_arguments -s : \
{\*-c,\*--clean}'[Remove old packages from cache]' \
"$_pacman_opts_common[@]" \
- "$_pacman_opts_sync_modifiers[@]" \
+ "$_pacman_opts_sync_modifiers[@]"
;;
sync_group)
_arguments -s : \
@@ -383,6 +383,12 @@ _pacman_zsh_comp() {
"$_pacman_opts_sync_modifiers[@]" \
'*:package group:_pacman_completions_all_groups'
;;
+ S*s*)
+ _arguments -s : \
+ "$_pacman_opts_common[@]" \
+ "$_pacman_opts_sync_modifiers[@]" \
+ '*:search text: '
+ ;;
S*)
_pacman_action_sync
;;
@@ -472,8 +478,8 @@ _key_longopts=(
)
_pacman_key_options=(
- '--config[Use an alternate config file (instead of /etc/pacman.con)]: :_files'
- '--gpgdir[Set an alternate directory for GnuPG (instead of /etc/pacman.d/gnupg)]: :_files -/'
+ '--config[Use an alternate config file (instead of @sysconfdir@/pacman.conf)]: :_files'
+ '--gpgdir[Set an alternate directory for GnuPG (instead of @sysconfdir@/pacman.d/gnupg)]: :_files -/'
'--keyserver[Specify a keyserver to use if necessary]'
)
@@ -579,7 +585,7 @@ _makepkg_longopts=(
'--allsource[Generate a source-only tarball including downloaded source]'
'--asroot[Allow makepkg to run as root user]'
'--check[Run check() function in the PKGBUILD]'
- '--config[Use an alternate config file instead of '/etc/makepkg.conf']: :_files'
+ '--config[Use an alternate config file instead of '@sysconfdir@/makepkg.conf']: :_files'
'--holdver[Prevent automatic version bumping for development PKGBUILDs]'
'--key[Specify key to use for gpg signing instead of the default]: :_keys'
'--nocheck[Do not run the check() function in the PKGBUILD]'