Jelajahi Sumber

lib/init: fix grass_config_dir

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@47948 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Metz 13 tahun lalu
induk
melakukan
da9a4c59e9
2 mengubah file dengan 7 tambahan dan 4 penghapusan
  1. 0 1
      lib/init/Makefile
  2. 7 3
      lib/init/grass.py

+ 0 - 1
lib/init/Makefile

@@ -74,7 +74,6 @@ endif
 	-e 's#@LD_LIBRARY_PATH_VAR@#$(LD_LIBRARY_PATH_VAR)#' \
 	-e 's#@START_UP@#$(START_UP)#' \
 	-e 's#@CONFIG_PROJSHARE@#$(PROJSHARE)#' \
-	-e 's#@GRASS_CONFIG_DIR@#$(GRASS_CONFIG_DIR)#' \
 	$< > $@
 	chmod +x $@
 

+ 7 - 3
lib/init/grass.py

@@ -43,7 +43,13 @@ if os.environ.has_key('GRASS_PROJSHARE'):
     config_projshare = os.environ['GRASS_PROJSHARE']
 else:
     config_projshare = "@CONFIG_PROJSHARE@"
-grass_config_dirname = "@GRASS_CONFIG_DIR@"
+
+if sys.platform == 'win32':
+    grass_config_dirname = "grass7"
+    grass_config_dir = os.path.join(os.getenv('APPDATA'), grass_config_dirname)
+else:
+    grass_config_dirname = ".grass7"
+    grass_config_dir = os.path.join(os.getenv('HOME'), grass_config_dirname)
 
 gisbase = os.path.normpath(gisbase)
 
@@ -958,8 +964,6 @@ if windows:
     if not os.getenv('SHELL'):
         os.environ['SHELL'] = os.getenv('COMSPEC', 'cmd.exe')
 
-grass_config_dir = os.path.join(os.getenv('HOME'), grass_config_dirname)
-
 atexit.register(cleanup)
 
 # Set default GUI