mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-24 06:40:07 +00:00
Merge pull request #2946 from moinakg/master
Solaris portability tweaks.
This commit is contained in:
commit
57ff83db59
3 changed files with 31 additions and 3 deletions
|
@ -25,7 +25,12 @@ bindkey -M menuselect '^o' accept-and-infer-next-history
|
||||||
|
|
||||||
zstyle ':completion:*:*:*:*:*' menu select
|
zstyle ':completion:*:*:*:*:*' menu select
|
||||||
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
|
||||||
|
if [ "$OSTYPE[0,7]" = "solaris" ]
|
||||||
|
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"
|
zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
|
||||||
|
fi
|
||||||
|
|
||||||
# disable named-directories autocompletion
|
# disable named-directories autocompletion
|
||||||
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
|
||||||
|
|
|
@ -1,3 +1,21 @@
|
||||||
|
if [ "$OSTYPE[0,7]" = "solaris" ]
|
||||||
|
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() {
|
man() {
|
||||||
env \
|
env \
|
||||||
LESS_TERMCAP_mb=$(printf "\e[1;31m") \
|
LESS_TERMCAP_mb=$(printf "\e[1;31m") \
|
||||||
|
@ -7,5 +25,8 @@ man() {
|
||||||
LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
|
LESS_TERMCAP_so=$(printf "\e[1;44;33m") \
|
||||||
LESS_TERMCAP_ue=$(printf "\e[0m") \
|
LESS_TERMCAP_ue=$(printf "\e[0m") \
|
||||||
LESS_TERMCAP_us=$(printf "\e[1;32m") \
|
LESS_TERMCAP_us=$(printf "\e[1;32m") \
|
||||||
|
PAGER=/usr/bin/less \
|
||||||
|
_NROFF_U=1 \
|
||||||
|
PATH=${HOME}/bin:${PATH} \
|
||||||
man "$@"
|
man "$@"
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,7 +1,9 @@
|
||||||
#!/bin/sh
|
#!/usr/bin/env zsh
|
||||||
|
|
||||||
|
zmodload zsh/datetime
|
||||||
|
|
||||||
function _current_epoch() {
|
function _current_epoch() {
|
||||||
echo $(($(date +%s) / 60 / 60 / 24))
|
echo $(( $EPOCHSECONDS / 60 / 60 / 24 ))
|
||||||
}
|
}
|
||||||
|
|
||||||
function _update_zsh_update() {
|
function _update_zsh_update() {
|
||||||
|
|
Loading…
Reference in a new issue