diff options
| author | Kaiwen Xu <kevin@kevxu.net> | 2014-03-02 14:13:55 -0500 |
|---|---|---|
| committer | Kaiwen Xu <kevin@kevxu.net> | 2014-03-02 14:13:55 -0500 |
| commit | 2691520d6f84fd0022fcb82a497042bb92c777b7 (patch) | |
| tree | aad57942159767997151b83a0e6941c828a287e9 /plugins/sublime/sublime.plugin.zsh | |
| parent | 5ba96e9a053514d6beb25e5c27cf4af746f142ef (diff) | |
| download | zsh-2691520d6f84fd0022fcb82a497042bb92c777b7.tar.gz zsh-2691520d6f84fd0022fcb82a497042bb92c777b7.tar.bz2 zsh-2691520d6f84fd0022fcb82a497042bb92c777b7.zip | |
Integrate changes from #1841.
Diffstat (limited to 'plugins/sublime/sublime.plugin.zsh')
| -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 6ca5892e5..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" - "/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" -) - if [[ $('uname') == 'Linux' ]]; then - if [ -f '/opt/sublime_text/sublime_text' ]; then - st_run() { /opt/sublime_text/sublime_text $@ &| } - else - st_run() { /usr/bin/sublime-text $@ &| } - 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 |