From 0dd83bd3aa5d5d6cf3c7b0639cd0e32aeac5e3b8 Mon Sep 17 00:00:00 2001 From: James McGlashan Date: Sun, 27 Nov 2011 00:12:03 +1100 Subject: [PATCH] This is nothing. got deleted! moved to zshrc.arch-zsh-template and edited. Was zshrc, but modified --- templates/zshrc | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) mode change 100755 => 100644 templates/zshrc diff --git a/templates/zshrc b/templates/zshrc old mode 100755 new mode 100644 index 5b8ecbc7d..0f857cb9c --- a/templates/zshrc +++ b/templates/zshrc @@ -81,11 +81,11 @@ bindkey '^i' expand-or-complete-prefix # Set up auto alias -s html=$BROWSER -alias -s zip='tar -xzvf' -alias -s tar='tar -xzvf' -alias -s tgz='tar -xzvf' -alias -s gz='tar -xzvf' -alias -s xz='tar -xzvf' +alias -s zip='tar -xf' +alias -s tar='tar -xf' +alias -s tgz='tar -xf' +alias -s gz='tar -xf' +alias -s xz='tar -xf' alias -s txt=$EDITOR alias -s PKGBUILD=$EDITOR @@ -104,10 +104,10 @@ alias pkg-list="pacman -Qei \$(pacman -Qq)|awk 'BEGIN {FS=\":\"}/^Name/{printf(\ alias -g DN='&> /dev/null &' pacman() { + pacman_bin=${commands[pacman-color]:-/usr/bin/pacman} + sudo_bin==sudo case $1 in - -S | -S[^sih]* | -R* | -U*) /usr/bin/su -c"/usr/bin/pacman-color \"$@\"" || /usr/bin/su -c"/usr/bin/pacman \"$@\"" ;; - *) /usr/bin/pacman-color "$@" || /usr/bin/pacman "$@" ;; + -S | -S[^sih]* | -R* | -U*) $sudo_bin /bin/su -c"$pacman_bin \"$@\"" ;; + *) $pacman_bin "$@" ;; esac } - -/usr/local/share/oh-my-zsh.sh