5ba96e9a053514d6beb25e5c27cf4af746f142ef

Author
Kaiwen Xu <kevin@kevxu.net>
Committer
Kaiwen Xu <kevin@kevxu.net>
Date

Message

Fixed sublime plugin behaviors.

- Fixed subl search path order in Mac because Sublime Text 3 is named
  Sublime Text.app by default instead of Sublime Text 3.app and they are
  mostly likely to be placed in /Applications instead of
  $HOME/Applications.
- Fixed sublime text binary path in Linux. The sublime_text binary
  installed by Ubuntu installer is placed in /opt/sublime_text/sublime_text
  instead of /usr/bin/sublime_text.
- Use zsh's built-in process detach syntax instead of nohup.

Diff

 1diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
 2index 5662791839d77cdaa1c162ae4f45a98b3c4db554..6ca5892e5d0053b112c001685ac13c3d22a53aee 100755
 3--- a/plugins/sublime/sublime.plugin.zsh
 4+++ b/plugins/sublime/sublime.plugin.zsh
 5@@ -3,19 +3,19 @@
 6 local _sublime_darwin_paths > /dev/null 2>&1
 7 _sublime_darwin_paths=(
 8     "/usr/local/bin/subl"
 9-    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
10-    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
11-    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
12+    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
13     "/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
14     "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
15-    "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
16+    "$HOME/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl"
17+    "$HOME/Applications/Sublime Text 3.app/Contents/SharedSupport/bin/subl"
18+    "$HOME/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl"
19 )
20 
21 if [[ $('uname') == 'Linux' ]]; then
22-    if [ -f '/usr/bin/sublime_text' ]; then
23-        st_run() { nohup /usr/bin/sublime_text $@ > /dev/null & }
24+    if [ -f '/opt/sublime_text/sublime_text' ]; then
25+        st_run() { /opt/sublime_text/sublime_text $@ &| }
26     else
27-        st_run() { nohup /usr/bin/sublime-text $@ > /dev/null & }
28+        st_run() { /usr/bin/sublime-text $@ &| }
29     fi
30     alias st=st_run
31