From cf8a371db4a6fbf47ff7cd1716ea4674fd346fc2 Mon Sep 17 00:00:00 2001
From: Chas Wareing <c3w@juicypop.net>
Date: Thu, 10 May 2012 22:47:44 -0700
Subject: [PATCH] screen sessions added

---
 README     | 7 ++++++-
 ash        | 6 ++++--
 ashrc-dist | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README b/README
index 1a85c2d..c11d5f5 100644
--- a/README
+++ b/README
@@ -1,6 +1,11 @@
-'Ash' v0.1
+'Ash' v0.2
 http://github.com/c3w/ash
 
+2012MAY10 c3w
+
+added 'screen' option in the ashrc json
+	. great for wonky networks and ssh tunnels
+
 2011OCT25 c3w
 
 TAB host auto-complete added!
diff --git a/ash b/ash
index 613fc67..ae30694 100755
--- a/ash
+++ b/ash
@@ -31,6 +31,8 @@ stuff.each do|k,v|
 	  $tunnel_port = "-p #{value} "
         when "tunnel_user"
 	  $tunnel_user = "-l #{value} "
+        when "screen"
+	  $screen = "screen -R #{value} "
       end
     end
 
@@ -38,9 +40,9 @@ stuff.each do|k,v|
     system(cmd)
 
     if $tunnel != ""
-      cmd = "ssh -A #{$tunnel} #{$tunnel_user} #{$tunnel_port} \"ssh #{$port} -t #{$fqdn} #{$user}\""
+      cmd = "ssh -A #{$tunnel} #{$tunnel_user} #{$tunnel_port} \"#{$screen} ssh #{$port} -t #{$fqdn} #{$user}\""
     else
-      cmd = "ssh -A #{$port} #{$user} #{$fqdn}"
+      cmd = "ssh -A #{$port} #{$user} #{$fqdn} -t #{$screen}"
     end
     system(cmd)
 end
diff --git a/ashrc-dist b/ashrc-dist
index 1add032..b145b05 100644
--- a/ashrc-dist
+++ b/ashrc-dist
@@ -13,6 +13,7 @@
 		  "user": "myuser",
 		  "tunnel": "www.something.com",
 		  "tunnel_user": "root",
- 		  "tunnel_port": "22"
+ 		  "tunnel_port": "22",
+		  "screen": "myscreen"
 		}
 }