[GRASS-SVN] r39948 - grass/trunk/macosx/app

[svn_grass at osgeo.org]

Author: kyngchaos
Date: 2009-12-08 19:41:56 -0500 (Tue, 08 Dec 2009)
New Revision: 39948

Modified:
   grass/trunk/macosx/app/build_gui_user_menu.sh
   grass/trunk/macosx/app/build_html_user_index.sh
   grass/trunk/macosx/app/grass.sh.in
Log:
use same app supp in menu/doc scripts as defined in startup script

Modified: grass/trunk/macosx/app/build_gui_user_menu.sh
===================================================================
--- grass/trunk/macosx/app/build_gui_user_menu.sh	2009-12-08 11:02:11 UTC (rev 39947)
+++ grass/trunk/macosx/app/build_gui_user_menu.sh	2009-12-09 00:41:56 UTC (rev 39948)
@@ -12,9 +12,9 @@
 # may be my limited knowledge of sh scripting and there could be a way.
 
 GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
-BINDIR="$HOME/Library/GRASS/$GRASS_MMVER/Modules/bin"
-BINDIRG="/Library/GRASS/$GRASS_MMVER/Modules/bin"
-MENUDIR="$HOME/Library/GRASS/$GRASS_MMVER/Modules/etc"
+BINDIR="$GISBASE_USER/Modules/bin"
+BINDIRG="$GISBASE_SYSTEM/Modules/bin"
+MENUDIR="$GISBASE_USER/Modules/etc"
 
 echo "Rebuilding Addon menu..."
 

Modified: grass/trunk/macosx/app/build_html_user_index.sh
===================================================================
--- grass/trunk/macosx/app/build_html_user_index.sh	2009-12-08 11:02:11 UTC (rev 39947)
+++ grass/trunk/macosx/app/build_html_user_index.sh	2009-12-09 00:41:56 UTC (rev 39948)
@@ -16,11 +16,6 @@
 
 ############# nothing to configure below ############
 
-GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
-GRASSVERSION=`cat "$GISBASE/etc/VERSIONNUMBER"`
-HTMLDIR="$HOME/Library/GRASS/$GRASS_MMVER/Modules/docs/html"
-HTMLDIRG="/Library/GRASS/$GRASS_MMVER/Modules/docs/html"
-
 # $1 is current path to GRASS.app/Contents/MacOS, defaults to /Applications
 if [ "$1" != "" ] ; then
 	GISBASE=$1
@@ -28,6 +23,11 @@
 	GISBASE="/Applications/GRASS-$GRASS_MMVER.app/Contents/MacOS"
 fi
 
+GRASS_MMVER=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
+GRASSVERSION=`cat "$GISBASE/etc/VERSIONNUMBER"`
+HTMLDIR="$GISBASE_USER/Modules/docs/html"
+HTMLDIRG="$GISBASE_SYSTEM/Modules/docs/html"
+
 write_html_header()
 {
 # $1: filename

Modified: grass/trunk/macosx/app/grass.sh.in
===================================================================
--- grass/trunk/macosx/app/grass.sh.in	2009-12-08 11:02:11 UTC (rev 39947)
+++ grass/trunk/macosx/app/grass.sh.in	2009-12-09 00:41:56 UTC (rev 39948)
@@ -32,7 +32,9 @@
 grass_ver=`cut -d . -f 1-2 "$GISBASE/etc/VERSIONNUMBER"`
 
 GISBASE_USER="$HOME/Library/Application Support/GRASS/$grass_ver"
+export GISBASE_USER
 GISBASE_SYSTEM="/Library/Application Support/GRASS/$grass_ver"
+export GISBASE_SYSTEM
 
 # for extra utils
 # ideally user should have these in their PATH, but make sure here