summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xxsh35
1 files changed, 14 insertions, 21 deletions
diff --git a/xsh b/xsh
index 41270cf..6f522f4 100755
--- a/xsh
+++ b/xsh
@@ -8,20 +8,19 @@ usage() {
termwrapper() {
PRG=$@
- titletext="$title $titleopt"
if [ "$V" = 1 ]; then
echo $PRG
sleep 4
fi
if [ -n "$PRG" ]; then
-# x-terminal-emulator +sb -sl 500 -n "$title" -title "$title" --title "$title" -e $PRG &
- x-terminal-emulator $opts $titleoptname "$titletext" -e $PRG &
-# exec x-terminal-emulator $opts $titleoptname "$title" -e $PRG &
+# x-terminal-emulator +sb -sl 500 -e $PRG &
+ x-terminal-emulator $opts -e $PRG &
+# exec x-terminal-emulator $opts -e $PRG &
else
-# exec x-terminal-emulator +sb -sl 500 -n "$title" -title "$title" --title "$title" &
- x-terminal-emulator $opts $titleoptname "$titletext" &
-# exec x-terminal-emulator $opts $titleoptname "$title" &
+# exec x-terminal-emulator +sb -sl 500 &
+ x-terminal-emulator $opts &
+# exec x-terminal-emulator $opts &
fi
}
@@ -79,20 +78,19 @@ if [ "$X" = 1 -a "$SU" = 1 -a "$SUHACK" != 1 ]; then
SUHACK=1
fi
-titleopt="[$HOST]"
if [ $HOST != "localhost" ]; then
ssh_opts="-C $ssh_opts"
fi
case `readlink /etc/alternatives/x-terminal-emulator | xargs basename` in
-# rxvt*) opts="+sb -sl 500 -n \"$titletext\""; titleoptname="-title";;
- rxvt*) opts="+sb -sl 500 -ls"; titleoptname="-title";;
- urxvt*) opts="+sb -sl 500 -ls"; titleoptname="-title";;
- *xterm) opts="+sb -sl 500 +wc"; titleoptname="-title";;
- gnome-terminal) opts=""; titleoptname="--title";;
- gnome-terminal.wrapper) opts=""; titleoptname="-title";;
- konsole*) opts="--notoolbar"; titleoptname="-T";;
- *) opts=""; titleoptname="-T";;
+# rxvt*) opts="+sb -sl 500";;
+ rxvt*) opts="+sb -sl 500 -ls";;
+ urxvt*) opts="+sb -sl 500 -ls";;
+ *xterm) opts="+sb -sl 500 +wc";;
+ gnome-terminal) opts="";;
+ gnome-terminal.wrapper) opts="";;
+ konsole*) opts="--notoolbar";;
+ *) opts="";;
esac
# Pause for a moment if verbose
@@ -101,10 +99,8 @@ if [ "$V" = 1 ]; then
fi
if [ -z "$prg_base" ]; then
- title="$SCRIPT"
prg_base='/bin/bash'
else
- title="$prg_base"
prg_opts_local="$prg_opts"
prg_opts_remote="$prg_opts"
fi
@@ -117,16 +113,13 @@ if [ "$SU" != 1 ]; then
if [ $HOST = "localhost" ]; then
termwrapper $prg_local
else
- titleopt="[$HOST]"
termwrapper ssh $ssh_opts $HOST $prg_remote
fi
else
if [ "$SUHACK" = 1 ]; then
- titleopt="[$HOST]"
# termwrapper ssh $ssh_opts $HOST su $su_opts -c \"$prg_remote\"
termwrapper ssh $ssh_opts $HOST $prg_remote
else
- titleopt="[$HOST root]"
if [ "$SUU" = 1 ]; then
if [ -z "$USER" ]; then
termwrapper ssh $ssh_opts $HOST $prg_remote_suu