[rkward-cvs] SF.net SVN: rkward:[3038] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 3038
          http://rkward.svn.sourceforge.net/rkward/?rev=3038&view=rev
Author:   tfry
Date:     2010-09-14 15:06:05 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
Simplify handling of --debugger option

Modified Paths:
--------------
    trunk/rkward/TODO
    trunk/rkward/debian/rkward.1
    trunk/rkward/rkward/rkward.sh.template

Modified: trunk/rkward/TODO
===================================================================
--- trunk/rkward/TODO	2010-09-14 14:16:32 UTC (rev 3037)
+++ trunk/rkward/TODO	2010-09-14 15:06:05 UTC (rev 3038)
@@ -30,7 +30,6 @@
 			- more precisely: seems to happen after scrolling
 			- no idea, why this happens
 	- Quitting via q() in the R console will often lead to a segfault during shutdown
-	- "seq", used in the wrapper script, is not always available on MacOS (and perhaps elsewhere)
 	- options ("pager") is currently broken in RKWard. May not be a problem, but we offer a GUI to configure it in Settings->Configure RKWard...
 
 Compilation / technical

Modified: trunk/rkward/debian/rkward.1
===================================================================
--- trunk/rkward/debian/rkward.1	2010-09-14 14:16:32 UTC (rev 3037)
+++ trunk/rkward/debian/rkward.1	2010-09-14 15:06:05 UTC (rev 3038)
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH RKWARD 1 "11-10-2005"
+.TH RKWARD 1 "14-09-2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -45,7 +45,7 @@
 Allows to configure, which sections of code to debug. Flags are given as a binary number. Refer to the source files for documentation, as this really is an internal option
 .TP
 .B \-\-debugger <command>
-Run RKWard through the specified debugger command. To add command line options to the debugger command, enclose them in single quotes ('') together with the command.
+Run RKWard through the specified debugger command. To add command line options to the debugger command, enclose them in single quotes ('') together with the command. NOTE: To use the \-\-debugger option, it must be specified as the first option on the command line.
 .TP
 .B \-\-disable-stack-check
 Disable the R C stack checking mechanism. If you see the error message "C stack usage too close to the limit", this option may serve as a workaround.

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2010-09-14 14:16:32 UTC (rev 3037)
+++ trunk/rkward/rkward/rkward.sh.template	2010-09-14 15:06:05 UTC (rev 3038)
@@ -30,16 +30,15 @@
 }
 
 debugger=
-for i in `seq $#`
-do
-  arg=$(eval echo \$\{`echo ${i}`\})
-  if [ "${arg}" = "--debugger" ]; then
-    debugger=$(eval echo \$\{`echo $((i+1))`\})
-    if test -z "`echo ${debugger} | sed 's/^-.*//'`"; then
-      error "option '${arg}' requires an argument"
-    fi
+if [ "${1}" = "--debugger" ]; then
+  shift
+  if [ -z "${1}" ]; then
+    error  "option '--debugger' requires an argument"
+  else
+    debugger=${1}
+    shift
   fi
-done
+fi
 
 ## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.