From dbc7fe7a5710bdd93d467ed11b9044949463d4a0 Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Sat, 22 Oct 2016 18:20:12 +0200
Subject: Apply ssh options directly.

---
 xsh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'xsh')

diff --git a/xsh b/xsh
index 630709c..74d32a9 100755
--- a/xsh
+++ b/xsh
@@ -25,15 +25,14 @@ SUDO=''
 X=''
 V=''
 HOST=''
-ssh_opts="-t"
-
+PORT=''
 while [ $# -gt 0 ]; do
 	case $1 in
 		su)		SU=1; SUDO=;;
 		sudo)		SUDO=1; SU=;;
-		--x|-x|x)	X=1; ssh_opts="$ssh_opts -X";;
-		--verbose|-v)	V=1; ssh_opts="$ssh_opts -v";;
-		--port|-p)	ssh_opts="$ssh_opts -p $2"; shift;;
+		--x|-x|x)	X=1;;
+		--verbose|-v)	V=1;;
+		--port|-p)	PORT="$2"; shift;;
 		--)		shift; break;;
 		-*)		usage; exit 1;;
 		@*)		HOST=${1#@};;
@@ -54,6 +53,6 @@ done
 # FIXME: needs shell wrapper (provided by SSH but not in local use)
 [ -z "$V" ] || set -- "$@"\; sleep 4
 
-[ -z "$HOST" ] || set -- ssh $ssh_opts $HOST "$@"
+[ -z "$HOST" ] || set -- ssh -t${X:+ -X}${V:+ -v}${PORT:+ -p "$PORT"} $HOST "$@"
 
 termwrapper "$@"
-- 
cgit v1.2.3