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

[tfry at users.sourceforge.net]

Revision: 1971
          http://rkward.svn.sourceforge.net/rkward/?rev=1971&view=rev
Author:   tfry
Date:     2007-09-19 11:52:58 -0700 (Wed, 19 Sep 2007)

Log Message:
-----------
Remove hard dependency on KDE konsole

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rkward.desktop
    trunk/rkward/rkward/rkward.sh.template

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-09-19 14:04:53 UTC (rev 1970)
+++ trunk/rkward/ChangeLog	2007-09-19 18:52:58 UTC (rev 1971)
@@ -1,3 +1,4 @@
+- make wrapper script work, when konsole is not installed
 - correct syntax highlighting for ::: and NA_integer_ and others
 - silence some GCC 4.2 warnings
 - fixed: crash when editing a data.frame with logicals (logicals are still mishandled, but less severe)
@@ -24,7 +25,7 @@
 - the modifier "not" for boolean properties returns a (negated) boolean sub-propery instead of just a string
 - add possibility to blacklist packages from fetching structure information. Package GO is blacklisted by default.
 - when fetching the structure of "promise" R objects, don't keep them in memory
-- optimize the function to retrieve the structure of R object (for display in the object browser, and completion)
+- optimize the function to retrieve the structure of R objects (for display in the object browser, and completion)
 - Messages, warnings, and errors for plugin commands are shown in the output, instead of in a dialog
 
 --- Version 0.4.7a - May-07-2007

Modified: trunk/rkward/rkward/rkward.desktop
===================================================================
--- trunk/rkward/rkward/rkward.desktop	2007-09-19 14:04:53 UTC (rev 1970)
+++ trunk/rkward/rkward/rkward.desktop	2007-09-19 18:52:58 UTC (rev 1971)
@@ -6,7 +6,7 @@
 Comment[pl]=Graficzny interfejs dla projektu R
 Comment[fr]=Interface graphique pour R
 Icon=rkward.png
-Exec=konsole -e rkward -caption "%c" %i %m  
+Exec=rkward -caption "%c" %i %m  
 Terminal=false
 Type=Application
 DocPath=rkward/index.html

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2007-09-19 14:04:53 UTC (rev 1970)
+++ trunk/rkward/rkward/rkward.sh.template	2007-09-19 18:52:58 UTC (rev 1971)
@@ -6,8 +6,18 @@
 if tty -s; then
   :
 else
-  konsole -e $0 "$@"
-  exit
+  # not on a tty? Try to invoke a suitable xterm
+  if [ -z $RKWARD_NORECURSE ]; then
+    for xtrm in konsole x-terminal-emulator xterm
+    do
+      xtrmc=`which $xtrm`
+      if [ ! -z $xtrmc -a -x $xtrmc ]; then
+        RKWARD_NORECURSE=y $xtrmc -e $0 "$@"
+        exit
+      fi
+    done
+    exit
+  fi
 fi
 
 R_HOME_DIR=###R_HOME_DIR###


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