Changeset 30347

Timestamp:

Feb 25, 2008, 10:59:35 AM (16 years ago)

Author:

kyngchaos

Message:

moved Terminal.app xterm emulation to separate script, make default in app startup

Location:

grass/trunk

Files:

• lib/init/grass-xterm-mac (added)
• lib/init/variables.html (modified) (1 diff)
• macosx/app/grass.sh.in (modified) (2 diffs)

grass/trunk/lib/init/variables.html

@@ -202 +202 @@
 <p>GRASS_XTERM
 <br>lib/init/grass-xterm-wrapper
-<br>&nbsp; set to any value (e.g. rxvt, aterm, gnome-terminal, konsole, Terminal.app) to substitute 'x-terminal-emulator' or 'xterm'
+<br>lib/init/grass-xterm-mac
+<br>&nbsp; set to any value (e.g. rxvt, aterm, gnome-terminal, konsole) to substitute 'x-terminal-emulator' or 'xterm'. The Mac OS X app startup defaults to an internal '$GISBASE/etc/grass-xterm-mac', which emulates the necessary xterm funtionality in Terminal.app.
 
 <p>GRASS_UI_TERM

grass/trunk/macosx/app/grass.sh.in

@@ -87 +87 @@
 fi
 
-# xterm - make sure X11 is in PATH
+# make sure X11 is in PATH
 pathX11=`echo "$PATH" | grep '/usr/X11\(R6\)\?/bin'`
 if [ ! "$pathX11" ] ; then
@@ -97 +97 @@
                 export PATH
         fi
+fi
+
+# default xterm Terminal emulator
+# note: only app startup defaults this way, CLI build still defaults to xterm
+if [ ! "$GRASS_XTERM" ] ; then
+        GRASS_XTERM="$GISBASE/etc/grass-xterm-mac"
+        export GRASS_XTERM
 fi