diff options
| author | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 | 
|---|---|---|
| committer | Andrew vonderLuft <avonderluft@avlux.net> | 2014-03-14 13:17:43 -0700 | 
| commit | bf4d4db72b065bff57d75355f49192175364b8a5 (patch) | |
| tree | 4ffa98f99c0919fda9418693d049a4bf7bf290f2 /plugins/sublime | |
| parent | 8f7971349b653706071bc41e2fdb953bb6f22678 (diff) | |
| parent | ee21fe94473404b58cbaea5b2c279f7a07c34ce1 (diff) | |
| download | zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.gz zsh-bf4d4db72b065bff57d75355f49192175364b8a5.tar.bz2 zsh-bf4d4db72b065bff57d75355f49192175364b8a5.zip | |
Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh into dev
Diffstat (limited to 'plugins/sublime')
| -rwxr-xr-x | plugins/sublime/sublime.plugin.zsh | 41 | 
1 files changed, 24 insertions, 17 deletions
| diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh index 566279183..a2042343a 100755 --- a/plugins/sublime/sublime.plugin.zsh +++ b/plugins/sublime/sublime.plugin.zsh @@ -1,25 +1,32 @@  # Sublime Text 2 Aliases -local _sublime_darwin_paths > /dev/null 2>&1 -_sublime_darwin_paths=( -    "/usr/local/bin/subl" -    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl" -    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" -    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" -    "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl" -    "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" -    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" -) -  if [[ $('uname') == 'Linux' ]]; then -    if [ -f '/usr/bin/sublime_text' ]; then -        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & } -    else -        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & } -    fi -    alias st=st_run +    local _sublime_linux_paths > /dev/null 2>&1 +    _sublime_linux_paths=( +        "$HOME/bin/sublime_text" +        "/opt/sublime_text/sublime_text" +        "/usr/bin/sublime_text" +        "/usr/local/bin/sublime_text" +    ) +    for _sublime_path in $_sublime_linux_paths; do +        if [[ -a $_sublime_path ]]; then +            st_run() { $_sublime_path $@ >/dev/null 2>&1 &| } +            alias st=st_run +            break +        fi +    done  elif  [[ $('uname') == 'Darwin' ]]; then +    local _sublime_darwin_paths > /dev/null 2>&1 +    _sublime_darwin_paths=( +        "/usr/local/bin/subl" +        "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" +        "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl" +        "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" +        "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" +        "$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 | 
