AbstractOperatingSystem.st
changeset 9014 f4df89a42724
parent 8997 e6f0f9b71488
child 9021 6541db62a929
--- a/AbstractOperatingSystem.st	Thu Dec 15 10:07:47 2005 +0100
+++ b/AbstractOperatingSystem.st	Thu Dec 15 14:07:46 2005 +0100
@@ -3917,47 +3917,43 @@
     "/
     "/ the current (default) directory
     "/
-    sysPath add:(Filename currentDirectory name).
+    sysPath add:(Filename currentDirectory pathName).
 
     "/
     "/ the users home (login) directory
     "/
     homePath := OperatingSystem getHomeDirectory.
     homePath notNil ifTrue:[
-"/ NO LONGER
-"/        (sysPath includes:homePath) ifFalse:[
-"/            sysPath add:homePath.
-"/        ].
-"/
-	"/
-	"/ a users private smalltalk directory in its home (login) directory
-	"/
-	OperatingSystem isUNIXlike ifTrue:[
-	    priv := '.smalltalk'.
-	] ifFalse:[
-	    priv := 'smalltalk'.
-	].
-	userPrivateSTXDir := homePath asFilename constructString:priv.
-	(userPrivateSTXDir asFilename isDirectory) ifTrue:[
-	    (sysPath includes:userPrivateSTXDir) ifFalse:[
-		sysPath add:userPrivateSTXDir
-	    ]
-	].
+        "/
+        "/ a users private smalltalk directory in its home (login) directory
+        "/
+        OperatingSystem isUNIXlike ifTrue:[
+            priv := '.smalltalk'.
+        ] ifFalse:[
+            priv := 'smalltalk'.
+        ].
+        userPrivateSTXDir := homePath asFilename constructString:priv.
+        (userPrivateSTXDir asFilename isDirectory) ifTrue:[
+            (sysPath includes:userPrivateSTXDir) ifFalse:[
+                sysPath add:userPrivateSTXDir
+            ]
+        ].
     ].
 
     "/
     "/ SMALLTALK_LIBDIR, STX_LIBDIR and STX_TOPDIR from the environment
     "/
-    #( 'SMALLTALK_LIBDIR'
-       'STX_LIBDIR'
-	'STX_TOPDIR'
+    #( 
+        'SMALLTALK_LIBDIR'
+        'STX_LIBDIR'
+        'STX_TOPDIR'
      ) do:[:each |
-	p := OperatingSystem getEnvironment:each.
-	p notNil ifTrue:[
-	    (sysPath includes:p) ifFalse:[
-		sysPath add:p
-	    ]
-	].
+        p := OperatingSystem getEnvironment:each.
+        p notNil ifTrue:[
+            (sysPath includes:p) ifFalse:[
+                sysPath add:p
+            ]
+        ].
     ].
     ^ sysPath
 
@@ -5794,7 +5790,7 @@
 !AbstractOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.148 2005-11-21 15:53:07 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.149 2005-12-15 13:07:28 cg Exp $'
 ! !
 
 AbstractOperatingSystem initialize!