From 94d2357c843d2defc7513fe37843e3c7e9f475ac Mon Sep 17 00:00:00 2001
From: Jonas Smedegaard <dr@jones.dk>
Date: Fri, 21 Oct 2016 22:51:57 +0200
Subject: Tidy use of variable prg (remote flavor superfluous).

---
 xsh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'xsh')

diff --git a/xsh b/xsh
index d4e82af..8ceecb3 100755
--- a/xsh
+++ b/xsh
@@ -99,25 +99,23 @@ if [ -z "$prg_base" ]; then
 	prg_base='/bin/bash'
 fi
 
-prg_local="$prg_base $prg_opts"
-prg_remote="bash --login -i -c \"$prg_base $prg_opts\""
-prg_remote_suu="echo -n 'Changing to root...: '; su $su_opts -c \"cd; $prg_base $prg_opts\""
+prg="$prg_base $prg_opts"
+prg_remote_suu="echo -n 'Changing to root...: '; su $su_opts -c \"cd; $prg\""
 
 if [ "$SU" != 1 ]; then
 	if [ $HOST = "localhost" ]; then
-		termwrapper $prg_local
+		termwrapper $prg
 	else
-		termwrapper ssh $ssh_opts $HOST $prg_remote
+		termwrapper ssh $ssh_opts $HOST $prg
 	fi
 else
 	if [ "$SUHACK" = 1 ]; then
-#		termwrapper ssh $ssh_opts $HOST su $su_opts -c \"$prg_remote\"
-		termwrapper ssh $ssh_opts $HOST $prg_remote
+		termwrapper ssh $ssh_opts $HOST $prg
 	else
 		if [ "$SUU" = 1 ]; then
 			termwrapper ssh $ssh_opts $HOST $prg_remote_suu
 		else
-			termwrapper ssh $ssh_opts root@$HOST $prg_remote
+			termwrapper ssh $ssh_opts root@$HOST $prg
 		fi
 	fi
 fi
-- 
cgit v1.2.3