Merge branch 'master' of majnematic.com:davesdots

This commit is contained in:
David Majnemer 2010-05-10 00:36:06 -05:00
commit 89988996ac
2 changed files with 25 additions and 34 deletions

View file

@ -39,63 +39,44 @@ zstyle ':completion:*:jobs' numbers true
# kill/killall menu and general process listing # kill/killall menu and general process listing
zstyle ':completion:*:*:kill:*' menu yes select zstyle ':completion:*:*:kill:*' menu yes select
zstyle ':completion:*:*:kill:*' sort false zstyle ':completion:*:*:kill:*' sort false
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=31;31' zstyle ':completion:*:processes' list-colors '=(#b) #([0-9]#)*=0=31;31'
zstyle ':completion:*:*:killall:*' menu yes select zstyle ':completion:*:*:killall:*' menu yes select
case `uname -s` in case `uname -s` in
Linux) Linux)
zstyle ':completion:*:processes-names' command 'ps -e --no-headers -o args' zstyle ':completion:*processes' command 'ps --forest -U '${USERNAME}' -o pid,args | sed "/ps --forest -U '${USERNAME}' -o pid,args/d"'
;;
FreeBSD|Interix|OpenBSD|SunOS)
zstyle ':completion:*:processes-names' command 'ps -e -o args | awk "NR != 1"'
;;
Darwin)
if [[ `sw_vers -productVersion` = 10<5->.<-> ]] ; then
zstyle ':completion:*:processes-names' command 'ps -e -o command | awk "NR != 1"'
else
zstyle ':completion:*:processes-names' command 'ps -A -o command | awk "NR != 1"'
fi
;;
CYGWIN*)
zstyle ':completion:*:processes-names' command 'ps -e -s | awk "NR != 1"'
;;
esac
case `uname -s` in
Linux)
zstyle ':completion:*:*:kill:*:processes' command 'ps --forest -U '${USERNAME}' -o pid,args | sed "/ps --forest -U '${USERNAME}' -o pid,args/d"'
;; ;;
Interix) Interix)
zstyle ':completion:*:*:kill:*:processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"' zstyle ':completion:*processes' command 'ps -i -U '${USERNAME}' -o pid,args | sed "/ps -i -U '${USERNAME}' -o pid,args/d"'
;; ;;
CYGWIN*) CYGWIN*)
zstyle ':completion:*:*:kill:*:processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"' zstyle ':completion:*processes' command 'ps -u '${USERNAME}' -s | sed "/ps -u '${USERNAME}' -s/d"'
;; ;;
SunOS|FreeBSD|OpenBSD) SunOS|FreeBSD|OpenBSD)
zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,args | sed "/ps -U '${USERNAME}' -o pid,args/d"' zstyle ':completion:*processes' command 'ps -U '${USERNAME}' -o pid,args | sed "/ps -U '${USERNAME}' -o pid,args/d"'
;; ;;
Darwin) Darwin)
zstyle ':completion:*:*:kill:*:processes' command 'ps -U '${USERNAME}' -o pid,command | sed "/ps -U '${USERNAME}' -o pid/d"' zstyle ':completion:*processes' command 'ps -U '${USERNAME}' -o pid,command | sed "/ps -U '${USERNAME}' -o pid/d"'
;; ;;
esac esac
case `uname -s` in case `uname -s` in
Interix|SunOS|FreeBSD|Linux) Interix|SunOS|FreeBSD|Linux)
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm" zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o comm"
;; ;;
CYGWIN*) CYGWIN*)
zstyle ':completion:*:*:killall:*:processes-names' command "ps -u '${USERNAME}' -s" zstyle ':completion:*:processes-names' command "ps -u '${USERNAME}' -s"
;; ;;
Darwin) Darwin)
if [[ `sw_vers -productVersion` = 10<5->.<-> ]] ; then if [[ `sw_vers -productVersion` = 10<5->.<-> ]] ; then
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o comm" zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o comm"
else else
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command" zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o command"
fi fi
;; ;;
OpenBSD) OpenBSD)
zstyle ':completion:*:*:killall:*:processes-names' command "ps -U '${USERNAME}' -o command" zstyle ':completion:*:processes-names' command "ps -U '${USERNAME}' -o command"
;; ;;
esac esac

View file

@ -1,11 +1,21 @@
# prompt # prompt
if [ "${TERM}" != "dumb" ] ; then if [ "${TERM}" != "dumb" ] ; then
RESETCOLOR=$'%{\e[00;00m%}'
if [ -z "${SSH_TTY}" ] ; then if [ -z "${SSH_TTY}" ] ; then
PROMPT=$'%{\e[00;00m%}%{\e[01;32m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}' HOSTCOLOR=$'%{\e[01;32m%}'
else else
PROMPT=$'%{\e[00;00m%}%{\e[01;36m%}%n@%m %{\e[01;34m%}%~ %(?..%{\e[01;31m%})%(!.#.$) %{\e[00;00m%}' HOSTCOLOR=$'%{\e[01;36m%}'
fi fi
RPROMPT=$'%{\e[00;00m%}%{\e[00;00m%}%1(j.%{\e[00;36m%}[%j].)%(?..%{\e[00;31m%}[%?])%{\e[01;33m%}%{\e[01;33m%}[%t]%{\e[00;00m%}' PATHCOLOR=$'%{\e[01;34m%}'
ERRORCOLOR=$'%{\e[00;31m%}'
BOLDERRORCOLOR=$'%{\e[01;31m%}'
CLOCKCOLOR=$'%{\e[01;33m%}'
JOBCOLOR=$'%{\e[00;36m%}'
RPROMPT=${RESETCOLOR}$'%1(j.'${JOBCOLOR}$'[%j].)%(?..'${ERRORCOLOR}$'[%?])'${CLOCKCOLOR}$'[%t]'${RESETCOLOR}
else else
PROMPT=$'%n@%m %~ %(?..)%(!.#.$)' RESETCOLOR=''
HOSTCOLOR=''
PATHCOLOR=''
BOLDERRORCOLOR=''
fi fi
PROMPT=${RESETCOLOR}${HOSTCOLOR}$'%n@%m '${PATHCOLOR}$'%45<...<%~ %(?..'${BOLDERRORCOLOR}$')%(!.#.$) '${RESETCOLOR}