Browse Source

use more reasonable config directory

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38708 15284696-431f-4ddb-bdfa-cd5b030d7da7
Markus Neteler 15 years ago
parent
commit
016c0e9545

+ 1 - 1
raster/r.li/r.li.daemon/daemon.c

@@ -102,7 +102,7 @@ int calculateIndex(char *file, int f(int, char **, area_des, double *),
        ######################################################### */
 
     /* TODO: check if this path is portable */
-    sprintf(pathSetup, "%s/.r.li/history/%s", getenv("HOME"), file);
+    sprintf(pathSetup, "%s/.grass7/r.li/%s", getenv("HOME"), file);
     parsed = parseSetup(pathSetup, l, g, raster);
 
     /*########################################################

+ 1 - 1
raster/r.li/r.li.setup/r.li.setup.html

@@ -47,7 +47,7 @@ rectangles with differents colors (green for the raster map,
 red for the sample 
 frame and blue for the sample areas), and other notes (disposition of 
 sample areas etc).
-The configuration file is saved in <tt>~/.r.li/history/my_conf</tt>.
+The configuration file is saved in <tt>~/.grass7/r.li/my_conf</tt>.
 <!-- NOT REALLY CLEAR: -->
 Configuration output files are raster if moving window disposition was
 selected, otherwise they are in ~/.r.li/output folder.

+ 7 - 8
raster/r.li/r.li.setup/r.li.setup.main

@@ -163,7 +163,7 @@ proc createNewConfiguration {} {
 	exec rm -f $env(TMP).set
 	exec rm -f *.tmp
 	destroy .newConf
-	openDir  .files "~/.r.li/history"
+	openDir  .files "~/.grass7/r.li"
 	}
 	# insert top label
 	label .newConf.topLabel -text "Insert new sampling area settings"
@@ -317,8 +317,7 @@ proc setSampleRegions {widget} {
 #MAIN WINDOW
 ##################################################
  # create directories
- catch { exec mkdir $env(HOME)/.r.li } 
-catch {  exec mkdir $env(HOME)/.r.li/history } 
+ catch { exec mkdir $env(HOME)/.grass7/r.li } 
  bind . <Control-c> {
  	exec rm -f $env(TMP).set
 	destroy .
@@ -336,8 +335,8 @@ catch {  exec mkdir $env(HOME)/.r.li/history }
  	      
 pack .files -side right -expand 1 -fill both -padx 7 -pady 7 
 
- # show configuration files in ~/.r.li/history
- openDir  .files "~/.r.li/history"
+ # show configuration files in ~/.grass7/r.li
+ openDir  .files "~/.grass7/r.li"
  
  #create load button
  
@@ -376,16 +375,16 @@ button .r -text "Remove" -width 8 -command {
 		
 	# create yes button
 	button .removeconf.buttons.y -text "Yes" -width 8 -command { 
-	      if { [ catch { exec rm $env(HOME)/.r.li/history/$selection } ] } then { 
+	      if { [ catch { exec rm $env(HOME)/.grass7/r.li/$selection } ] } then { 
 		tk_messageBox -message "'$selection' Not deleted" -type ok -icon error} else {
 		tk_messageBox -message "$selection  deleted" -type ok
-		openDir .files "~/.r.li/history"
+		openDir .files "~/.grass7/r.li"
 		destroy .removeconf}
 	}
 	
 	# create no button
 	button .removeconf.buttons.n -text "No" -width 8 -command { destroy .removeconf
-	openDir .files "~/.r.li/history"}
+	openDir .files "~/.grass7/r.li"}
 	grid .removeconf.buttons.y  .removeconf.buttons.n
 	}
 }