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

Merge branch 'master' into fix-local-in-sublime-plugin

Browse source
This commit is contained in:
Andrew Janke 2015-09-28 08:49:34 -04:00
commit b5491fdb1b
120 changed files with 6988 additions and 1066 deletions
Download patch file Download diff file Expand all files Collapse all files

16
plugins/sublime/sublime.plugin.zsh
View file

@ -35,7 +35,6 @@ elif [[ "$OSTYPE" = darwin* ]]; then
"$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
"$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
)
for _sublime_path in $_sublime_darwin_paths; do
if [[ -a $_sublime_path ]]; then
subl () { "$_sublime_path" $* }
@ -43,6 +42,21 @@ elif [[ "$OSTYPE" = darwin* ]]; then
break
fi
done
elif [[ "$OSTYPE" = 'cygwin' ]]; then
local _sublime_cygwin_paths > /dev/null 2>&1
_sublime_cygwin_paths=(
"$(cygpath $ProgramW6432/Sublime\ Text\ 2)/sublime_text.exe"
"$(cygpath $ProgramW6432/Sublime\ Text\ 3)/sublime_text.exe"
)
for _sublime_path in $_sublime_cygwin_paths; do
if [[ -a $_sublime_path ]]; then
subl () { "$_sublime_path" $* }
alias st=subl
break
fi
done
fi
alias stt='st .'