class: AbstractOperatingSystem
changed: #defaultSystemPath
do filename decoding (linux)
--- a/AbstractOperatingSystem.st Thu Dec 13 14:37:05 2012 +0100
+++ b/AbstractOperatingSystem.st Thu Dec 13 14:52:25 2012 +0100
@@ -4254,17 +4254,17 @@
"/
appPath := self pathOfSTXExecutable.
appPath notNil ifTrue:[
- appDir := appPath asFilename directory.
- appPath := appDir pathName.
- (sysPath includes:appPath) ifFalse:[
- sysPath add:appPath.
- ].
- appDir baseName = 'bin' ifTrue:[
- appPath := appDir directory pathName.
- (sysPath includes:appPath) ifFalse:[
- sysPath add:appPath.
- ].
- ].
+ appDir := appPath asFilename directory.
+ appPath := appDir pathName.
+ (sysPath includes:appPath) ifFalse:[
+ sysPath add:appPath.
+ ].
+ appDir baseName = 'bin' ifTrue:[
+ appPath := appDir directory pathName.
+ (sysPath includes:appPath) ifFalse:[
+ sysPath add:appPath.
+ ].
+ ].
].
"/
@@ -4272,45 +4272,45 @@
"/
homePath := self getHomeDirectory.
homePath notNil ifTrue:[
- "/
- "/ a users private smalltalk directory in its home (login) directory
- "/
- OperatingSystem isUNIXlike ifTrue:[
- priv := '.smalltalk'.
- ] ifFalse:[
- priv := 'smalltalk'.
- ].
- userPrivateSTXDir := homePath asFilename construct:priv.
- (userPrivateSTXDir isDirectory) ifTrue:[
- userPrivateSTXDir := userPrivateSTXDir pathName.
- (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 construct:priv.
+ (userPrivateSTXDir isDirectory) ifTrue:[
+ userPrivateSTXDir := userPrivateSTXDir pathName.
+ (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:[
- p := p asFilename pathName.
- (p asFilename isDirectory) ifTrue:[
- (sysPath includes:p) ifFalse:[
- sysPath add:p
- ]
- ]
- ].
+ p := OperatingSystem decodePath:(OperatingSystem getEnvironment:each).
+ p notNil ifTrue:[
+ p := p asFilename pathName.
+ (p asFilename isDirectory) ifTrue:[
+ (sysPath includes:p) ifFalse:[
+ sysPath add:p
+ ]
+ ]
+ ].
].
^ sysPath
"
- OperatingSystem defaultSystemPath
+ OperatingSystem defaultSystemPath
"
"Modified: / 24.12.1999 / 00:30:27 / cg"
@@ -7146,11 +7146,11 @@
!AbstractOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.221 2012-12-13 13:18:43 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.222 2012-12-13 13:52:25 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.221 2012-12-13 13:18:43 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.222 2012-12-13 13:52:25 stefan Exp $'
! !
AbstractOperatingSystem initialize!