--- a/STXInstaller.st	Mon May 31 18:23:26 1999 +0200
+++ b/STXInstaller.st	Mon May 31 18:44:46 1999 +0200
@@ -3,7 +3,7 @@
 		installSourceFiles installSTCFiles installGoodyFiles fullDir
 		actionPercentageHolder actionTextHolder commandTraceView
 		resources dfHolder copyProcess installWhat'
-	classVariableNames:'LastPartialDir LastBinDir LastLibBinDir LastLibDir LastFullDir'
+	classVariableNames:'LastPartialDir LastFullDir'
 	poolDictionaries:''
 	category:'eXept-tools'
 !
@@ -78,6 +78,47 @@
     "Created: / 25.2.1998 / 17:14:43 / cg"
 !
 
+defaultInstDirs
+    |dirs d stxRel|
+
+    stxRel := self smalltalkRelease.
+    dirs := OrderedCollection new.
+
+    OperatingSystem isMSWINDOWSlike ifTrue:[
+        dirs add:'c:\Programme\eXept\SmalltalkX\' , stxRel.
+        dirs add:'c:\Programme\SmalltalkX\' , stxRel.
+        dirs add:'c:\SmalltalkX\' , stxRel.
+    ] ifFalse:[
+        dirs add:'/opt/smalltalk/' , stxRel.
+        dirs add:'/usr/local/smalltalkX'.
+
+        d := (Filename homeDirectory constructString:'smalltalkX').
+        (dirs includes:d) ifFalse:[dirs add:d].
+        d := (Filename homeDirectory constructString:'stx').
+        (dirs includes:d) ifFalse:[dirs add:d].
+        d := '/tmp/stx'.
+        (dirs includes:d) ifFalse:[dirs add:d].
+        ('/home' asFilename exists and:['/home' asFilename isDirectory]) ifTrue:[
+            d := '/home/stx'.
+            (dirs includes:d) ifFalse:[dirs add:d].
+        ].
+        ('/home2' asFilename exists and:['/home2' asFilename isDirectory]) ifTrue:[
+            d := '/home2/stx'.
+            (dirs includes:d) ifFalse:[dirs add:d].
+        ].
+    ].
+
+"/    dirs := dirs select:[:path | 
+"/                            |f|
+"/
+"/                            f := path asFilename.
+"/                            f exists and:[f isDirectory]].
+    ^ dirs "sort"
+
+    "Created: / 18.7.1996 / 19:43:00 / cg"
+    "Modified: / 31.5.1999 / 18:32:17 / cg"
+!
+
 defaultLibBinDirs
     |dirs stxRel|
 
@@ -978,18 +1019,18 @@
      goodyMegabytes stxRel list stxInstDir
     |
 
-    binMegabytes := 12.
+    binMegabytes := 20.
     libMegabytes := 30.
-    docMegabytes := 15.
+    docMegabytes := 12.
     stcMegabytes := 2.
-    srcMegabytes := 25.
-    goodyMegabytes := 2.
+    srcMegabytes := 20.
+    goodyMegabytes := 10.
 
     stxRel := self smalltalkRelease.
 
     OperatingSystem isMSWINDOWSlike ifTrue:[
         LastPartialDir isNil ifTrue:[
-            LastPartialDir := 'c:\Programme\SmalltalkX\' , stxRel 
+            LastPartialDir := 'c:\Programme\eXept\SmalltalkX\' , stxRel 
         ].
 "/        LastLibDir isNil ifTrue:[
 "/            LastLibDir := 'c:\Programme\SmalltalkX\' , stxRel , '\lib'
@@ -1055,7 +1096,7 @@
     l adjust:#right; backgroundColor:dark; foregroundColor:Color white.
 
     cm := ComboBoxView on:stxInstDirHolder.
-    list := self defaultBinDirs collect:[:line |
+    list := self defaultInstDirs collect:[:line |
                 line replChar:$\ withString:'\\'
             ].
     cm list:list.
@@ -1181,7 +1222,7 @@
     "
 
     "Created: / 25.2.1998 / 17:11:26 / cg"
-    "Modified: / 31.5.1999 / 13:42:48 / cg"
+    "Modified: / 31.5.1999 / 18:37:50 / cg"
 !
 
 askForFullInstallation
@@ -1495,12 +1536,12 @@
 
     "
      LastLibDir := LastBinDir := LastLibBinDir := nil.
-     LastPartialDir := nil.
+     LastPartialDir := LastFullDir := nil.
 
      STXInstaller open
     "
 
-    "Modified: / 31.5.1999 / 13:41:27 / cg"
+    "Modified: / 31.5.1999 / 18:28:10 / cg"
 !
 
 postInstall