Browse Source

NSIS script: remove fix for grass_config_dir

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47951 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 years ago
parent
commit
4ef8e67ca8
1 changed files with 5 additions and 11 deletions
  1. 5 11
      mswindows/GRASS-Installer.nsi

+ 5 - 11
mswindows/GRASS-Installer.nsi

@@ -880,17 +880,17 @@ Section "GRASS" SecGRASS
 	;replace \ with / in $GIS_DATABASE
 	${StrReplace} "$UNIX_LIKE_GIS_DATABASE_PATH" "\" "/" "$GIS_DATABASE"
   
-	;create $APPDATA\GRASS7\rc
+	;create $APPDATA\grass7\rc
 	SetShellVarContext current
 	ClearErrors
-	CreateDirectory	$APPDATA\GRASS7
-	FileOpen $0 $APPDATA\GRASS7\rc w
-	IfErrors done_create_GRASS7\rc
+	CreateDirectory	$APPDATA\grass7
+	FileOpen $0 $APPDATA\grass7\rc w
+	IfErrors done_create_grass7\rc
 	FileWrite $0 'GISDBASE: $UNIX_LIKE_GIS_DATABASE_PATH$\r$\n'
 	FileWrite $0 'LOCATION_NAME: demolocation$\r$\n'
 	FileWrite $0 'MAPSET: PERMANENT$\r$\n'
 	FileClose $0	
-	done_create_GRASS7\rc:
+	done_create_grass7\rc:
 	
 	;replace gisbase = "/c/OSGeo4W/apps/grass/grass-7.0.svn" in grass70.py with $INSTDIR
 	Push "$INSTDIR\grass70.py" ; file to modify
@@ -903,12 +903,6 @@ Section "GRASS" SecGRASS
 	Push 'config_projshare = "/c/OSGeo4W/share/proj"' ; string that a line must begin with *WS Sensitive*
 	Push 'config_projshare = "$INSTDIR\proj"' ; string to replace whole line with
 	Call ReplaceLineStr
-
-	;replace grass_config_dirname = ".grass7" i n grass70.py with GRASS7
-	Push "$INSTDIR\grass70.py" ; file to modify
-	Push 'grass_config_dirname = ".grass7"' ; string that a line must begin with *WS Sensitive*
-	Push 'grass_config_dirname = "GRASS7"' ; string to replace whole line with
-	Call ReplaceLineStr
                  
 SectionEnd