From f9280a0523d0c49039a0ad27718701c20d874ec3 Mon Sep 17 00:00:00 2001 From: Daniel Wallace Date: Fri, 5 Apr 2013 19:31:57 -0400 Subject: zsh completion: make sure -Ss works if you put a type in pacman -Ss it doesn't work because it never passes through they pointer ->sync_search to set $state. All of the other iterations like this have a case, add one for -S*s* Signed-off-by: Allan McRae --- contrib/zsh_completion.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'contrib') diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index f9d11063..9edcdfaf 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 ;; -- cgit v1.2.3-70-g09d2 From 0f486adfec6d44f7578e526379078231aa300601 Mon Sep 17 00:00:00 2001 From: William Giokas <1007380@gmail.com> Date: Mon, 1 Apr 2013 10:19:35 +0000 Subject: contrib: Use sysconfdir instead of /etc Don't force people to see /etc. Signed-off-by: William Giokas <1007380@gmail.com> Signed-off-by: Allan McRae --- contrib/zsh_completion.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'contrib') diff --git a/contrib/zsh_completion.in b/contrib/zsh_completion.in index 9edcdfaf..c150144c 100644 --- a/contrib/zsh_completion.in +++ b/contrib/zsh_completion.in @@ -478,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]' ) @@ -585,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]' -- cgit v1.2.3-70-g09d2 From 32c91e28952f3b746da7513849a8f3c996aab807 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Mon, 8 Apr 2013 22:00:04 +1000 Subject: contrib/checkupdates: do not log Avoid the log file filling up with "[PACMAN] synchronizing package lists". Signed-off-by: Allan McRae --- contrib/checkupdates.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib') 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 -- cgit v1.2.3-70-g09d2 From 597286eb258f841dfc00f65474138fc6192f0092 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Thu, 11 Apr 2013 09:18:47 -0400 Subject: paccache: avoid subshell in calling runcmd Avoids problems with one of the worst CLI tools ever created, su. Fixes FS#34656. Signed-off-by: Dave Reisner Signed-off-by: Allan McRae --- contrib/paccache.sh.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib') 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[@]}" -- cgit v1.2.3-70-g09d2