linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-07-10 05:41:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
smeagolthellama 2018-06-23 16:16:49 +03:00
commit 8e5c8b95c2
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/autojump/autojump.plugin.zsh
View file

@ -15,8 +15,8 @@ if [ $commands[autojump] ]; then # check if autojump is installed
. /etc/profile.d/autojump.sh . /etc/profile.d/autojump.sh
elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation elif [ -f /usr/local/share/autojump/autojump.zsh ]; then # freebsd installation
. /usr/local/share/autojump/autojump.zsh . /usr/local/share/autojump/autojump.zsh
elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports elif [ -f /opt/local/etc/profile.d/autojump.sh ]; then # mac os x with ports
. /opt/local/etc/profile.d/autojump.zsh . /opt/local/etc/profile.d/autojump.sh
elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew
. `brew --prefix`/etc/autojump.sh . `brew --prefix`/etc/autojump.sh
fi fi

4
plugins/common-aliases/common-aliases.plugin.zsh
View file

@ -13,7 +13,7 @@ alias lS='ls -1FSsh'
alias lart='ls -1Fcart' alias lart='ls -1Fcart'
alias lrt='ls -1Fcrt' alias lrt='ls -1Fcrt'
alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file alias zshrc='${=EDITOR} ~/.zshrc' # Quick access to the ~/.zshrc file
alias grep='grep --color' alias grep='grep --color'
alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} ' alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
@ -44,8 +44,6 @@ alias p='ps -f'
alias sortnr='sort -n -r' alias sortnr='sort -n -r'
alias unexport='unset' alias unexport='unset'
alias whereami=display_info
alias rm='rm -i' alias rm='rm -i'
alias cp='cp -i' alias cp='cp -i'
alias mv='mv -i' alias mv='mv -i'

1
plugins/sbt/sbt.plugin.zsh
View file

@ -7,6 +7,7 @@
# aliases - mnemonic: prefix is 'sb' # aliases - mnemonic: prefix is 'sb'
alias sbc='sbt compile' alias sbc='sbt compile'
alias sbcc='sbt clean compile'
alias sbco='sbt console' alias sbco='sbt console'
alias sbcq='sbt console-quick' alias sbcq='sbt console-quick'
alias sbcl='sbt clean' alias sbcl='sbt clean'