Replaced ~/.oz with ~/.oz/$OZVERSION

yjaradin · Mar 6, 2004 · 739258a · 739258a
1 parent 4acee97
commit 739258a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/ap/CustomOption.oz b/ap/CustomOption.oz
@@ -91,7 +91,7 @@ define
    fun {UserFile}
       case {Property.condGet 'user.custom.file' unit} of unit then
          case {OS.getEnv 'MOZART_CUSTOM_FILE'} of false then
-            '~/.oz/CUSTOM'
+            {Property.get 'oz.dotoz'}#'/CUSTOM'
          [] X then X end
       [] X then X end
    end

diff --git a/init/Prop.oz b/init/Prop.oz
@@ -62,7 +62,9 @@ OZ_SEARCH_PATH  = case {Getenv 'OZ_SEARCH_PATH'} of false then
                   elseof V then V end
 
 OZ_DOTOZ        = case {Getenv 'OZ_DOTOZ'} of false then
-                     '~/.oz'
+                     case {Getenv 'OZDOTOZ'} of false then
+                        '~/.oz/'#{GET 'oz.version'}
+                     elseof V then {SafePath V} end
                   elseof V then {SafePath V} end
 
 OZ_SEARCH_LOAD  = case {Getenv 'OZ_SEARCH_LOAD'} of false then

diff --git a/wp/TkOptions.oz b/wp/TkOptions.oz
@@ -140,7 +140,7 @@ local
              UserHome = {OS.getEnv 'HOME'}
           in
              if UserHome \= false then
-                F = UserHome # '/.oz/wishrc'
+                F = {Property.get 'oz.dotoz'} # '/wishrc'
              in
                 try {OS.stat F _} F
                 catch system(...) then unit end