[commit] r2113 - encoding and pathenc are UTF-8 unless overridden by command-line args

 
Author: piumarta
Date: 2009-08-27 22:25:58 -0700 (Thu, 27 Aug 2009)
New Revision: 2113

Modified:
   trunk/platforms/unix/ChangeLog
   trunk/platforms/unix/cmake/squeak.in
Log:
encoding and pathenc are UTF-8 unless overridden by command-line args

Modified: trunk/platforms/unix/ChangeLog
===================================================================
--- trunk/platforms/unix/ChangeLog 2009-08-28 03:01:54 UTC (rev 2112)
+++ trunk/platforms/unix/ChangeLog 2009-08-28 05:25:58 UTC (rev 2113)
@@ -1,5 +1,8 @@
 2009-08-27  Ian Piumarta  <com -dot- gmail -at- piumarta (backwards)>
 
+ * cmake/squeak.in: Path and text encodings are UTF-8 unless
+ overridden by command-line options.
+
  * cmake/configure (VM_VERSION): Generate automatically from
  VMMaker version and SVN revision.  Remove SQ_VERSION.
 

Modified: trunk/platforms/unix/cmake/squeak.in
===================================================================
--- trunk/platforms/unix/cmake/squeak.in 2009-08-28 03:01:54 UTC (rev 2112)
+++ trunk/platforms/unix/cmake/squeak.in 2009-08-28 05:25:58 UTC (rev 2113)
@@ -1,9 +1,9 @@
 #!/bin/sh
 #
 # Launch squeakvm from the command line or a menu script, with a good
-# plugin path and pulseaudio kludge
+# plugin path, text encodings and pulseaudio kludge
 #
-# Last edited: 2009-08-27 02:00:45 by piumarta on ubuntu.piumarta.com
+# Last edited: 2009-08-27 22:25:34 by piumarta on emilia-2.local
 
 PATH=/usr/bin:/bin
 
@@ -17,6 +17,8 @@
 vm="squeakvm"
 plugins=""
 sound=""
+pathenc="-pathenc UTF-8"
+encoding="-encoding UTF-8"
 
 # find the vm and set the plugin path
 
@@ -43,11 +45,13 @@
     fi
 fi
 
-# we should not interfere with the user's -plugins or -vm-sound options
+# we should not interfere with the user's command-line options
 
 for opt in $*; do
     case ${opt} in
  -plugins) plugins="";;
+ -pathenc) pathenc="";;
+ -encoding) encoding="";;
  -vm-sound*) sound=""; wrapper="";;
  -vm) case "$2" in sound*) sound=""; wrapper=""; esac;;
     esac
@@ -59,10 +63,18 @@
     plugins=""
 fi
 
+if test -n "${SQUEAK_PATHENC}"; then
+    pathenc=""
+fi
+
+if test -n "${SQUEAK_ENCODING}"; then
+    encoding=""
+fi
+
 if test -z "${plugins}"; then
     set -x
-    exec ${wrapper} "${vm}" ${sound} "$@"
+    exec ${wrapper} "${vm}" ${pathenc} ${encoding} ${sound} "$@"
 else
     set -x
-    exec ${wrapper} "${vm}" -plugins "${plugins}" ${sound} "$@"
+    exec ${wrapper} "${vm}" ${pathenc} ${encoding} -plugins "${plugins}" ${sound} "$@"
 fi