linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-20 03:13:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/netzverweigerer/oh-my-zsh

Browse source
This commit is contained in:
Armin 2015-03-13 19:53:22 +01:00
commit 2ac8039dd6
5 changed files with 203 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

44
zshrc
View file

@ -112,42 +112,44 @@ if [[ "$OS_TYPE" == "Darwin" ]]; then
export HOMEBREW_VERBOSE=1
export HOMEBREW_CURL_VERBOSE=1
export HOMEBREW_NO_EMOJI=1
# let's use ls from gnu utils because the bsd ls doesn't know long options:
if hash gls; then
if hash gls >/dev/null 2>&1; then
LS_COMMAND="gls"
else
LS_COMMAND="ls"
fi
# homebrew verbose and without annoying emoji icon:
export HOMEBREW_VERBOSE=1
export HOMEBREW_CURL_VERBOSE=1
export HOMEBREW_NO_EMOJI=1
# let's use dircolors from gnu utils because the osx version is buggy:
alias dircolors="gdircolors"
# Linux specific stuff
if hash gdircolors >/dev/null 2>&1; then
alias dircolors="gdircolors"
dircolors_enable=1
fi
if hash gls >/dev/null 2>&1; then
alias ls='gls $LS_OPTIONS'
fi
else
LS_COMMAND="ls"
fi
if [[ "$OS_TYPE" == "FreeBSD" ]]; then
CLICOLOR=1; export CLICOLOR
alias installport="sudo make config-recursive install clean clean-depends"
if [[ ! -e /usr/local/bin/gls ]]; then
echo "You should install the \"coreutils\" FreeBSD port."
else
alias ls='gls $LS_OPTIONS'
if hash gls >/dev/null 2>&1; then
alias ls='gls -al -F'
LS_COMMAND=gls
fi
if [[ ! -e /usr/local/bin/gdircolors ]]; then
echo "You should install the \"coreutils\" FreeBSD port."
else
alias dircolors='/usr/local/bin/gdircolors'
CLICOLOR=1; export CLICOLOR
alias portinstall="sudo make config-recursive install clean clean-depends"
if hash gdircolors >/dev/null 2>&1; then
alias dircolors="$(which gdircolors)"
dircolors_enable=1
fi
fi
# enable ls colorization:
if [ "$TERM" != "dumb" ]; then
eval "$(dircolors "$ZSH"/dircolors)"
alias ls="$LS_COMMAND $LS_OPTIONS"
if [[ "$dircolors_enable" == 1 ]]; then
eval "$(dircolors "$ZSH"/dircolors)"
alias ls="$LS_COMMAND $LS_OPTIONS"
fi
fi
# set $SHELL:
@ -176,8 +178,10 @@ alias grep='grep --color=auto'
# enable ls colorization:
if [ "$TERM" != "dumb" ]; then
eval "$(dircolors "$ZSH"/dircolors)"
alias ls="$LS_COMMAND $LS_OPTIONS"
if [[ "$dircolors_enable" == 1 ]]; then
eval "$(dircolors "$ZSH"/dircolors)"
alias ls="$LS_COMMAND $LS_OPTIONS"
fi
fi
# do not autocorrect sudo commands (fixes "zsh: correct 'vim' to '.vim' [nyae]?")