From 481059fbbfd7d6bbf1a3b65cbb808d3200859c48 Mon Sep 17 00:00:00 2001
From: Eugen Konkov <kes-kes@yandex.ru>
Date: Thu, 14 May 2015 19:49:48 +0300
Subject: [PATCH 1/4] Implemented INSTALL_PREFIX env variable

Now you can 'INSTALL_PREFIX=~/bin ./ssh-copy-rsub [user@]host' to install into
home directory
---
 ssh-copy-rsub | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ssh-copy-rsub b/ssh-copy-rsub
index 30a2b71..310938d 100755
--- a/ssh-copy-rsub
+++ b/ssh-copy-rsub
@@ -3,6 +3,11 @@
 # Shell script to install rsub on the remove server so we can open shell scripts locally.
 # Author: Leon Radley (http://github.com/leon)
 
+if [ -z "$INSTALL_PREFIX" ] ; then
+    INSTALL_PREFIX="/usr/local/bin"
+fi
+
+
 URL="https://raw.github.com/textmate/rmate/master/rmate"
 
 if [ "$#" -gt 1 ] || [ "$1" = "-b" ] || [ "$1" = "--bash" ]; then
@@ -14,6 +19,9 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
 
 cat <<EOF
 Usage: $0 [--bash] [user@]machine
+Environment:
+   INSTALL_PREFIX=$INSTALL_PREFIX
+
 
 # Install Sublime Text plugin
 https://github.com/henrikpersson/rsub
@@ -36,7 +44,7 @@ EOF
 exit 1
 fi
 
-wget --quiet -O - "${URL}" | ssh ${1%:} 'umask 077; test -d /usr/local/bin || mkdir -p /usr/local/bin; cat > /usr/local/bin/rsub; chmod a+rx /usr/local/bin/rsub' || exit 1
+wget --quiet -O - "${URL}" | ssh ${1%:} "umask 077; test -d $INSTALL_PREFIX || mkdir -p $INSTALL_PREFIX; cat > $INSTALL_PREFIX/rsub; chmod a+rx $INSTALL_PREFIX/rsub" || exit 1
 
 cat <<EOF
 

From b05c91ab66ce9beac944cff0cc72eaae51ce7295 Mon Sep 17 00:00:00 2001
From: Eugen Konkov <kes-kes@yandex.ru>
Date: Sat, 19 Sep 2015 13:16:29 +0300
Subject: [PATCH 2/4] Bring window under ST3

---
 rsub.py | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/rsub.py b/rsub.py
index 5a77246..18cdd13 100644
--- a/rsub.py
+++ b/rsub.py
@@ -3,6 +3,7 @@
 import os
 import tempfile
 import socket
+
 from threading import Thread
 try:
     import socketserver
@@ -20,6 +21,7 @@
 
 SESSIONS = {}
 server = None
+WINDOW_HANDLE = 'sublime_text.sublime-text-2'
 
 
 def say(msg):
@@ -85,6 +87,7 @@ def send_save(self):
         self.socket.send(b"\n")
 
     def on_done(self):
+        global WINDOW_HANDLE
         # Create a secure temporary directory, both for privacy and to allow
         # multiple files with the same basename to be edited at once without
         # overwriting each other.
@@ -135,7 +138,7 @@ def on_done(self):
                           'tell app "Finder" to set frontmost of process "Sublime Text" to true')
         elif(sublime.platform() == 'linux'):
             import subprocess
-            subprocess.call("wmctrl -xa 'sublime_text.sublime-text-2'", shell=True)
+            subprocess.call("wmctrl -xa '%s'" % WINDOW_HANDLE, shell=True)
 
 
 class ConnectionHandler(socketserver.BaseRequestHandler):
@@ -186,7 +189,9 @@ def on_close(self, view):
 
 
 def plugin_loaded():
-    global SESSIONS, server
+    global SESSIONS, WINDOW_HANDLE, server
+
+    WINDOW_HANDLE = 'sublime_text.Sublime_text'
 
     # Load settings
     settings = sublime.load_settings("rsub.sublime-settings")

From 5223ac714104c0ed480cfb8509ecf26503834046 Mon Sep 17 00:00:00 2001
From: Eugen Konkov <kes-kes@yandex.ru>
Date: Sat, 19 Sep 2015 13:19:40 +0300
Subject: [PATCH 3/4] Revert "Implemented INSTALL_PREFIX env variable"

This reverts commit 481059fbbfd7d6bbf1a3b65cbb808d3200859c48.
---
 ssh-copy-rsub | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ssh-copy-rsub b/ssh-copy-rsub
index 310938d..30a2b71 100755
--- a/ssh-copy-rsub
+++ b/ssh-copy-rsub
@@ -3,11 +3,6 @@
 # Shell script to install rsub on the remove server so we can open shell scripts locally.
 # Author: Leon Radley (http://github.com/leon)
 
-if [ -z "$INSTALL_PREFIX" ] ; then
-    INSTALL_PREFIX="/usr/local/bin"
-fi
-
-
 URL="https://raw.github.com/textmate/rmate/master/rmate"
 
 if [ "$#" -gt 1 ] || [ "$1" = "-b" ] || [ "$1" = "--bash" ]; then
@@ -19,9 +14,6 @@ if [ "$#" -lt 1 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
 
 cat <<EOF
 Usage: $0 [--bash] [user@]machine
-Environment:
-   INSTALL_PREFIX=$INSTALL_PREFIX
-
 
 # Install Sublime Text plugin
 https://github.com/henrikpersson/rsub
@@ -44,7 +36,7 @@ EOF
 exit 1
 fi
 
-wget --quiet -O - "${URL}" | ssh ${1%:} "umask 077; test -d $INSTALL_PREFIX || mkdir -p $INSTALL_PREFIX; cat > $INSTALL_PREFIX/rsub; chmod a+rx $INSTALL_PREFIX/rsub" || exit 1
+wget --quiet -O - "${URL}" | ssh ${1%:} 'umask 077; test -d /usr/local/bin || mkdir -p /usr/local/bin; cat > /usr/local/bin/rsub; chmod a+rx /usr/local/bin/rsub' || exit 1
 
 cat <<EOF
 

From 768b893bd1e98125d4e878e45ceaa3e98ac99858 Mon Sep 17 00:00:00 2001
From: Eugen Konkov <kes-kes@yandex.ru>
Date: Mon, 21 Sep 2015 12:36:24 +0300
Subject: [PATCH 4/4] FIXED: plugin_loaded() is invoked for both Sublime 2 & 3

code was reoranged
---
 rsub.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/rsub.py b/rsub.py
index 18cdd13..811fc1b 100644
--- a/rsub.py
+++ b/rsub.py
@@ -21,7 +21,7 @@
 
 SESSIONS = {}
 server = None
-WINDOW_HANDLE = 'sublime_text.sublime-text-2'
+WINDOW_HANDLE = 'sublime_text.Sublime_text'
 
 
 def say(msg):
@@ -191,8 +191,6 @@ def on_close(self, view):
 def plugin_loaded():
     global SESSIONS, WINDOW_HANDLE, server
 
-    WINDOW_HANDLE = 'sublime_text.Sublime_text'
-
     # Load settings
     settings = sublime.load_settings("rsub.sublime-settings")
     port = settings.get("port", 52698)
@@ -205,4 +203,5 @@ def plugin_loaded():
 
 # call the plugin_loaded() function if running in sublime text 2
 if (int(sublime.version())< 3000):
+    WINDOW_HANDLE = 'sublime_text.sublime-text-2'
     plugin_loaded()