1 files changed, 36 insertions, 16 deletions
diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 1b2cbcdce..5acc75cc7 100755..100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -1,21 +1,41 @@
 # Sublime Text 2 Aliases
-#unamestr = 'uname'
-
-local _sublime_darwin_subl=/Applications/Sublime\ Text\ 2.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
-elif  [[ $('uname') == 'Darwin' ]]; then
-	# Check if Sublime is installed in user's home application directory
-	if [[ -a $HOME/${_sublime_darwin_subl} ]]; then
-		alias st='$HOME/${_sublime_darwin_subl}'
-	else
-		alias st='${_sublime_darwin_subl}'
-	fi
+    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"
+        "/usr/bin/subl"
+    )
+    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  [[ "$OSTYPE" = 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
+            alias subl="'$_sublime_path'"
+            alias st=subl
+            break
+        fi
+    done
 fi
+
 alias stt='st .'