Tidy terminal emulator call (drop wrapper).

1 files changed, 8 insertions, 14 deletions

diff --git a/xsh b/xsh
index 74d32a9..081d471 100755
--- a/xsh
+++ b/xsh
@@ -6,19 +6,6 @@ usage() {
 	echo "Usage: $SCRIPT [--x] [--verbose] [su|sudo] [[{user}]@{host}] [[--] command...]"
 }
 
-termwrapper() {
-	if [ "$V" = 1 ]; then
-		echo "$@"
-		sleep 4
-	fi
-
-	if [ $# -gt 0 ]; then
-		x-terminal-emulator -e "$@" &
-	else
-		x-terminal-emulator &
-	fi
-}
-
 # Initial setup
 SU=''
 SUDO=''
@@ -55,4 +42,11 @@ done
 
 [ -z "$HOST" ] || set -- ssh -t${X:+ -X}${V:+ -v}${PORT:+ -p "$PORT"} $HOST "$@"
 
-termwrapper "$@"
+[ -z "$V" ] || echo "$@"
+[ -z "$V" ] || sleep 4
+
+if [ $# -gt 0 ]; then
+	x-terminal-emulator -e "$@" &
+else
+	x-terminal-emulator &
+fi