[Antiright-devel] antiright/gtkshell gshterm

[Jeffrey Bedard]

CVSROOT:        /sources/antiright
Module name:    antiright
Changes by:     Jeffrey Bedard <jefbed> 10/07/31 17:54:15

Modified files:
        gtkshell       : gshterm 

Log message:
        Fixed proper quoting of multi-argument commands.  -e option must be the 
last,
        as all proceeding arguments are appended to the command.  

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/antiright/gtkshell/gshterm?cvsroot=antiright&r1=1.12&r2=1.13

Patches:
Index: gshterm
===================================================================
RCS file: /sources/antiright/antiright/gtkshell/gshterm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- gshterm     31 Jul 2010 13:41:09 -0000      1.12
+++ gshterm     31 Jul 2010 17:54:15 -0000      1.13
@@ -1,17 +1,24 @@
 #!/bin/sh
 
+OPTS_STRING="ae:g:f:hs:t"
+
 gshterm_usage()
 {
-       echo 'gshterm [e command][f font][s size][h]'
+       echo "gshterm -[$OPTS_STRING]"
        exit $1
 }
 
 FONT=""
 GEOMETRY=""
 COMMAND=""
-DEBUG="FALSE"
+#DEBUG="TRUE"
 APP_MODE=""
 TRANSPARENT=""
+SPCCMD="FALSE"
+
+if [ "$DEBUG" = "TRUE" ]; then
+       echo "INITIAL ARGS:  $@"
+fi
 
 while getopts "ae:g:f:hs:t" opt; do
        case "$opt" in
@@ -20,7 +27,7 @@
                                # About'"
                        ;;
                e)
-                       shift
+                       shift $(( $OPTIND - 2 ))
                        COMMAND="$@"
                        break
                        ;;
@@ -47,7 +54,6 @@
 
 ARGS=""
 
-
 if [ "$TRANSPARENT" != "" ]; then
        ARGS="$ARGS $TRANSPARENT"
 fi
@@ -55,23 +61,21 @@
 if [ "$GEOMETRY" != "" ]; then
        ARGS="$ARGS -og $GEOMETRY"
 fi
+
 if [ "$FONT" != "" ]; then
        ARGS="$ARGS -otf \"$FONT\""
 else
        ARGS="$ARGS -otf 'Mono 10'"
 fi
 
-#echo $*
-
 if [ "$COMMAND" = "" ]; then
        COMMAND=$SHELL
 fi
 
-
 COMMAND="gtkshell $APP_MODE -oF $ARGS -oT '$COMMAND' -as '$COMMAND'"
 if [ "$DEBUG" = "TRUE" ]; then
        echo $COMMAND
+       echo $@
+else
+       exec sh -c "$COMMAND"
 fi
-
-exec sh -c "$COMMAND"
-