# HG changeset patch
# User Claus Gittinger <cg@exept.de>
# Date 1004107571 -7200
# Node ID ef8a4a252a991b7613fe5656e8e55b49574745e5
# Parent  84373804a29f63398e898c36ff886f8502bad8a8
checkin from browser

diff -r 84373804a29f -r ef8a4a252a99 STXInstaller.st
--- a/STXInstaller.st	Fri Oct 26 16:05:29 2001 +0200
+++ b/STXInstaller.st	Fri Oct 26 16:46:11 2001 +0200
@@ -64,11 +64,15 @@
     |dirs|
 
     dirs := OrderedCollection new.
-    dirs add:(Filename homeDirectory constructString:'stxDevelop').
-    dirs add:((Filename homeDirectory construct:'stx') constructString:'develop').
-    ('/home' asFilename exists and:['/home' asFilename isDirectory]) ifTrue:[
-        dirs add:'/home/stx/develop'.
-    ].
+
+    dirs add:((Filename homeDirectory constructString:'stxDevelop')).
+    dirs add:((Filename homeDirectory constructString:'develop')).
+    dirs add:((Filename homeDirectory constructString:'work')).
+
+"/    ('/home' asFilename exists 
+"/    and:['/home' asFilename isDirectory]) ifTrue:[
+"/        dirs add:'/home/work'.
+"/    ].
 
     ^ dirs "sort"
 
@@ -436,6 +440,9 @@
     ].
 
     installWhat == #full ifTrue:[
+        "/ MUST be under stx (for packagePath stuff)
+        fullDir := fullDir asFilename constructString:'stx'.
+        
         msg at:4 put:('    all from CD' asText allBold).
         msg at:6 put:'    ' , (fullDir asText allBold).
         actionTextHolder value:nil.
@@ -1011,9 +1018,7 @@
      fullDirHolder|
 
     LastFullDir isNil ifTrue:[
-        LastFullDir := (Filename homeDirectory 
-                            construct:'stx')
-                            constructString:'develop'
+        LastFullDir := (Filename homeDirectory construct:'work') constructString:'stx'
     ].
 
     fullDirHolder := LastFullDir asValue.