From 6f100a21e2f39b3d3664c55041c0b9b9fb57005a Mon Sep 17 00:00:00 2001
From: Damien Guihal <dguihal@gmail.com>
Date: Wed, 24 Jun 2015 11:11:31 +0200
Subject: [PATCH] Improve portability for cygwin using env variables instead of
 hard coded values

---
 plugins/sublime/sublime.plugin.zsh | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh
index 7c148c162..30f519578 100644
--- a/plugins/sublime/sublime.plugin.zsh
+++ b/plugins/sublime/sublime.plugin.zsh
@@ -43,10 +43,18 @@ elif  [[ "$OSTYPE" = darwin* ]]; then
     done
 
 elif  [[ "$OSTYPE" == cygwin ]]; then
+    local cygprogfiles=""
+    cygprogfiles=$(cygpath "$PROGRAMFILES")
+    local cygprogfiles_x86=""
+    cygprogfiles_x86=$(cmd /c "echo %ProgramFiles(x86)%")
+    cygprogfiles_x86=${cygprogfiles_x86/[\\r\\n]//}
+    cygprogfiles_x86=$(cygpath "$cygprogfiles_x86")
     local _sublime_cygwin_paths > /dev/null 2>&1
     _sublime_cygwin_paths=(
-        "/cygdrive/c/Program Files/Sublime Text 2/sublime_text.exe"
-        "/cygdrive/c/Program Files (x86)/Sublime Text 2/sublime_text.exe"
+        "$cygprogfiles/Sublime Text 2/sublime_text.exe"
+        "$cygprogfiles/Sublime Text 3/sublime_text.exe"
+        "$cygprogfiles_x86/Sublime Text 2/sublime_text.exe"
+        "$cygprogfiles_x86/Sublime Text 3/sublime_text.exe"
     )
 
     IFS=$'\n'