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

[tfry at users.sourceforge.net]

Revision: 1389
          http://svn.sourceforge.net/rkward/?rev=1389&view=rev
Author:   tfry
Date:     2007-02-14 09:10:49 -0800 (Wed, 14 Feb 2007)

Log Message:
-----------
Enhanced workaround for SCIM

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

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2007-02-14 12:42:24 UTC (rev 1388)
+++ trunk/rkward/ChangeLog	2007-02-14 17:10:49 UTC (rev 1389)
@@ -1,4 +1,5 @@
 --- Version 0.4.6 - Feb-15-2007
+- make sure any LC_ALL environment setting will not be applied by SCIM plugin (if installed on the system)
 - fix crash after changing storage type of an object in the data editor
 - single line input fields in plugins no longer accept new-lines
 - support for calculating p-values in correlation matrix plugin

Modified: trunk/rkward/rkward/rkward.sh.template
===================================================================
--- trunk/rkward/rkward/rkward.sh.template	2007-02-14 12:42:24 UTC (rev 1388)
+++ trunk/rkward/rkward/rkward.sh.template	2007-02-14 17:10:49 UTC (rev 1389)
@@ -20,8 +20,19 @@
   error "R binary ('${R_binary}') not found. Most likely your installation of R has moved to a new location. Please rebuild rkward."
 fi
 
-## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (likely via some Qt stuff)
+## Apparently on some systems an embedded R gets outsmarted somehow, and LC_NUMERIC is set to some dangerous value for the whole app (via SCIM)
 ## To prevent this, set it here, explicitely. R does not work with wrong settings of LC_NUMERIC.
+
+## First, however, need to unset LC_ALL, if set. Instead we set LANG, so the default will be the same, where not overridden
+if [ -z "$LC_ALL" ]; then
+  :
+else
+  export LANG="$LC_ALL"
+  unset LC_ALL
+  echo "Warning: unsetting LC_ALL"
+fi
+
+## set LC_NUMERIC to "C"
 export LC_NUMERIC="C"
 
 ## Start rkward. Running through R CMD to set all the relevant R enviroment variables


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