diff options
| author | Moinak Ghosh <moinakg@gmail.com> | 2014-07-11 18:41:49 +0530 |
|---|---|---|
| committer | Moinak Ghosh <moinakg@gmail.com> | 2014-07-11 18:41:49 +0530 |
| commit | 5e328e3a9c0784521ae4170f7958183c352bae83 (patch) | |
| tree | 9ed82ca7e9fa049242b25075663216112a9365f2 | |
| parent | 5728a5608d7e802999266ff2387747e4957be938 (diff) | |
| download | zsh-5e328e3a9c0784521ae4170f7958183c352bae83.tar.gz zsh-5e328e3a9c0784521ae4170f7958183c352bae83.tar.bz2 zsh-5e328e3a9c0784521ae4170f7958183c352bae83.zip | |
Solaris portability tweaks.
| -rw-r--r-- | lib/completion.zsh | 7 | ||||
| -rw-r--r-- | oh-my-zsh.sh | 1 | ||||
| -rw-r--r-- | plugins/colored-man/colored-man.plugin.zsh | 21 | ||||
| -rw-r--r-- | tools/check_for_upgrade.sh | 8 |
4 files changed, 35 insertions, 2 deletions
diff --git a/lib/completion.zsh b/lib/completion.zsh index fa1d97f48..faea36118 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -25,7 +25,12 @@ bindkey -M menuselect '^o' accept-and-infer-next-history zstyle ':completion:*:*:*:*:*' menu select zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01' -zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w" +if [ "$PLAT" = "SunOS" ] +then + zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm" +else + zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w" +fi # disable named-directories autocompletion zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index c217b91bb..4683c2bc0 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -1,3 +1,4 @@ +PLAT=`uname -s` # Check for updates on initial load... if [ "$DISABLE_AUTO_UPDATE" != "true" ]; then /usr/bin/env ZSH=$ZSH DISABLE_UPDATE_PROMPT=$DISABLE_UPDATE_PROMPT zsh -f $ZSH/tools/check_for_upgrade.sh diff --git a/plugins/colored-man/colored-man.plugin.zsh b/plugins/colored-man/colored-man.plugin.zsh index 56056284a..4956f4346 100644 --- a/plugins/colored-man/colored-man.plugin.zsh +++ b/plugins/colored-man/colored-man.plugin.zsh @@ -1,3 +1,21 @@ +if [ "${PLAT}" = "SunOS" ] +then + if [ ! -x ${HOME}/bin/nroff ] + then + mkdir -p ${HOME}/bin + cat > ${HOME}/bin/nroff <<EOF +#!/bin/sh +if [ -n "\$_NROFF_U" -a "\$1,\$2,\$3" = "-u0,-Tlp,-man" ]; then + shift + exec /usr/bin/nroff -u\${_NROFF_U} "\$@" +fi +#-- Some other invocation of nroff +exec /usr/bin/nroff "\$@" +EOF + chmod +x ${HOME}/bin/nroff + fi +fi + man() { env \ LESS_TERMCAP_mb=$(printf "\e[1;31m") \ @@ -7,5 +25,8 @@ man() { LESS_TERMCAP_so=$(printf "\e[1;44;33m") \ LESS_TERMCAP_ue=$(printf "\e[0m") \ LESS_TERMCAP_us=$(printf "\e[1;32m") \ + PAGER=/usr/bin/less \ + _NROFF_U=1 \ + PATH=${HOME}/bin:${PATH} \ man "$@" } diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index 8b8ecae03..1aba9a272 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -1,7 +1,13 @@ #!/bin/sh +PLAT=`uname -s` function _current_epoch() { - echo $(($(date +%s) / 60 / 60 / 24)) + if [ "$PLAT" = "SunOS" ] + then + echo $(($(perl -e 'print time') / 60 / 60 / 24)) + else + echo $(($(date +%s) / 60 / 60 / 24)) + fi } function _update_zsh_update() { |