--- a/AbstractOperatingSystem.st Tue Nov 30 18:25:25 2010 +0100
+++ b/AbstractOperatingSystem.st Wed Dec 01 13:46:14 2010 +0100
@@ -12,37 +12,37 @@
"{ Package: 'stx:libbasic' }"
Object subclass:#AbstractOperatingSystem
- instanceVariableNames:''
- classVariableNames:'ConcreteClass LastErrorNumber LocaleInfo OSSignals PipeFailed
- ErrorSignal AccessDeniedErrorSignal FileNotFoundErrorSignal
- InvalidArgumentsSignal UnsupportedOperationSignal Resources'
- poolDictionaries:''
- category:'System-Support'
+ instanceVariableNames:''
+ classVariableNames:'ConcreteClass LastErrorNumber LocaleInfo OSSignals PipeFailed
+ ErrorSignal AccessDeniedErrorSignal FileNotFoundErrorSignal
+ InvalidArgumentsSignal UnsupportedOperationSignal Resources'
+ poolDictionaries:''
+ category:'System-Support'
!
Object subclass:#PrinterInfo
- instanceVariableNames:'printerName attributes documentProperties printerInfo2'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractOperatingSystem
+ instanceVariableNames:'printerName attributes documentProperties printerInfo2'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractOperatingSystem
!
Object subclass:#TimeInfo
- instanceVariableNames:'year month day hours minutes seconds utcOffset dst milliseconds
- dayInYear dayInWeek'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractOperatingSystem
+ instanceVariableNames:'year month day hours minutes seconds utcOffset dst milliseconds
+ dayInYear dayInWeek'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractOperatingSystem
!
Object subclass:#TimeZoneInfo
- instanceVariableNames:'bias name standardYear standardMonth standardDay standardWeekDay
- standardHour standardMinute standardBias daylightName
- standardDate daylightDate daylightYear daylightMonth daylightDay
- daylightWeekDay daylightHour daylightMinute daylightBias'
- classVariableNames:''
- poolDictionaries:''
- privateIn:AbstractOperatingSystem
+ instanceVariableNames:'bias name standardYear standardMonth standardDay standardWeekDay
+ standardHour standardMinute standardBias daylightName
+ standardDate daylightDate daylightYear daylightMonth daylightDay
+ daylightWeekDay daylightHour daylightMinute daylightBias'
+ classVariableNames:''
+ poolDictionaries:''
+ privateIn:AbstractOperatingSystem
!
!AbstractOperatingSystem primitiveDefinitions!
@@ -4153,12 +4153,20 @@
"/
"/ the executable's directory
+ "/ and the executables parent directory (if it is an installed version)
"/
appPath := self pathOfSTXExecutable.
appPath notNil ifTrue:[
- appDir := appPath asFilename directory pathName.
- (sysPath includes:appDir) ifFalse:[
- sysPath add:appDir.
+ 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.
+ ].
].
].
@@ -6982,11 +6990,11 @@
!AbstractOperatingSystem class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.203 2010-10-29 17:00:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.204 2010-12-01 12:46:14 stefan Exp $'
!
version_CVS
- ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.203 2010-10-29 17:00:02 cg Exp $'
+ ^ '$Header: /cvs/stx/stx/libbasic/AbstractOperatingSystem.st,v 1.204 2010-12-01 12:46:14 stefan Exp $'
! !
AbstractOperatingSystem initialize!