[GRASS-SVN] r40692 - in grass/branches/releasebranch_6_4: lib/init mswindows

[svn_grass at osgeo.org]

Author: hamish
Date: 2010-01-27 03:10:39 -0500 (Wed, 27 Jan 2010)
New Revision: 40692

Modified:
   grass/branches/releasebranch_6_4/lib/init/init.bat
   grass/branches/releasebranch_6_4/lib/init/init.sh
   grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
Log:
another attempt at an improved MSys dos prompt (merge from devbr6)

Modified: grass/branches/releasebranch_6_4/lib/init/init.bat
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.bat	2010-01-27 08:07:34 UTC (rev 40691)
+++ grass/branches/releasebranch_6_4/lib/init/init.bat	2010-01-27 08:10:39 UTC (rev 40692)
@@ -45,9 +45,11 @@
 set GRASS_PAGER=more
 if "%GRASS_WISH%"=="" set GRASS_WISH=wish.exe
 if "%GRASS_SH%"=="" set GRASS_SH=c:\msys\1.0\bin\sh.exe
+
 rem Should do something with "assoc .html" and ftype here but would require
 rem a new g.manual.bat too so leaving it like this for now...
 if "%GRASS_HTML_BROWSER%"=="" set GRASS_HTML_BROWSER=%SYSTEMDRIVE%/PROGRA~1/INTERN~1/IEXPLORE.EXE
+
 if "%GRASS_PROJSHARE%"=="" set GRASS_PROJSHARE=CONFIG_PROJSHARE
 
 rem Add python scripts to the PATHEXT variable

Modified: grass/branches/releasebranch_6_4/lib/init/init.sh
===================================================================
--- grass/branches/releasebranch_6_4/lib/init/init.sh	2010-01-27 08:07:34 UTC (rev 40691)
+++ grass/branches/releasebranch_6_4/lib/init/init.sh	2010-01-27 08:10:39 UTC (rev 40692)
@@ -975,16 +975,19 @@
     ;;
 
 *)
+    if [ "$MINGW" ] ; then
+	GRASS_BASE_VERSION=`echo "$GRASS_VERSION" | cut -f1,2 -d.`
+	PS1="GRASS $GRASS_BASE_VERSION> "
+	export PS1
 
-    PS1="GRASS $GRASS_VERSION ($LOCATION_NAME):\w > "
-    export PS1
-
-    if [ "$MINGW" ] ; then
 	# "$ETC/run" doesn't work at all???
-        "$SHELL"
+	"$SHELL"
 	rm -rf "$LOCATION/.tmp"/*  # remove gis.m session files from .tmp
     else
-    	"$ETC/run" "$SHELL"
+	PS1="GRASS $GRASS_VERSION ($LOCATION_NAME):\w > "
+	export PS1
+
+	"$ETC/run" "$SHELL"
 	EXIT_VAL=$?
     fi
     ;;

Modified: grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-27 08:07:34 UTC (rev 40691)
+++ grass/branches/releasebranch_6_4/mswindows/GRASS-Installer.nsi	2010-01-27 08:10:39 UTC (rev 40692)
@@ -663,8 +663,6 @@
 	FileWrite $0 'GRASS_PROJSHARE="$INSTALL_DIR\proj"$\r$\n'
 	FileWrite $0 'export GRASS_PROJSHARE$\r$\n'
 	FileWrite $0 '$\r$\n'
-	FileWrite $0 'export PS1="GRASS 6.4> "$\r$\n'
-	FileWrite $0 '$\r$\n'
 	FileWrite $0 'exec "$$GISBASE/etc/Init.sh" "$$@"'
 	FileClose $0
 	done_create_grass_command: