[GRASS-SVN] r41745 - in grass/trunk: lib/init mswindows

[svn_grass at osgeo.org]

Author: martinl
Date: 2010-04-06 10:11:52 -0400 (Tue, 06 Apr 2010)
New Revision: 41745

Modified:
   grass/trunk/lib/init/grass.py
   grass/trunk/mswindows/GRASS-Installer.nsi
Log:
various minor fixes in winGRASS installer

Modified: grass/trunk/lib/init/grass.py
===================================================================
--- grass/trunk/lib/init/grass.py	2010-04-06 13:21:15 UTC (rev 41744)
+++ grass/trunk/lib/init/grass.py	2010-04-06 14:11:52 UTC (rev 41745)
@@ -39,7 +39,10 @@
 cmd_name = "@START_UP@"
 grass_version = "@GRASS_VERSION_NUMBER@"
 ld_library_path_var = '@LD_LIBRARY_PATH_VAR@'
-config_projshare = "@CONFIG_PROJSHARE@"
+if os.getenv("GRASS_PROJSHARE"):
+    config_projshare = os.getenv("GRASS_PROJSHARE")
+else:
+    config_projshare = "@CONFIG_PROJSHARE@"
 grass_config_dirname = "@GRASS_CONFIG_DIR@"
 
 gisbase = os.path.normpath(gisbase)

Modified: grass/trunk/mswindows/GRASS-Installer.nsi
===================================================================
--- grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-06 13:21:15 UTC (rev 41744)
+++ grass/trunk/mswindows/GRASS-Installer.nsi	2010-04-06 14:11:52 UTC (rev 41745)
@@ -728,10 +728,7 @@
 	FileWrite $0 '"$$GRASS_PYTHON $$GISBASE/grass70.py" "$$@"'
 	FileClose $0
 	done_create_grass_command:
-
-	;Create the $INSTALL_DIR\msys\grass link directory
-	CreateDirectory $INSTALL_DIR\msys\grass
-	
+		
 	;Get the short form of the install path (to allow for paths with spaces)
 	VAR /GLOBAL INST_DIR_SHORT
 	GetFullPathName /SHORT $INST_DIR_SHORT $INSTALL_DIR
@@ -753,6 +750,7 @@
 	;create $PROFILE\.grass7\rc
 	SetShellVarContext current
 	ClearErrors
+	CreateDirectory	$PROFILE\.grass7
 	FileOpen $0 $PROFILE\.grass7\rc w
 	IfErrors done_create_.grass7\rc
 	FileWrite $0 'GISDBASE: $UNIX_LIKE_GIS_DATABASE_PATH$\r$\n'
@@ -761,7 +759,8 @@
 	FileClose $0	
 	done_create_.grass7\rc:
 	
-	CopyFiles $PROFILE\.grass7\rc $INSTALL_DIR\msys\home\$USERNAME
+	CreateDirectory	$INSTALL_DIR\msys\home\$USERNAME\.grass7
+	CopyFiles $PROFILE\.grass7\rc $INSTALL_DIR\msys\home\$USERNAME\.grass7
                  
 SectionEnd
 
@@ -908,7 +907,7 @@
 	
 	;remove the .grass7\rc file
 	SetShellVarContext current
-	Delete "$PROFILE\.grass7\rc"	
+	RMDir /r "$PROFILE\.grass7"
 
 	;remove the Registry Entries
 	DeleteRegKey HKLM "Software\${GRASS_BASE}"