#BUGFIX by cg
class: StandaloneStartup class
comment/format in: #startupFilename
changed: #handleRCFileOptionsFromArguments:
rcFile reading if currentDir is ~~ exec. dir
--- a/StandaloneStartup.st Thu Oct 11 15:39:04 2018 +0200
+++ b/StandaloneStartup.st Thu Oct 11 16:20:44 2018 +0200
@@ -16,10 +16,10 @@
"{ NameSpace: Smalltalk }"
Object subclass:#StandaloneStartup
- instanceVariableNames:''
- classVariableNames:'Verbose CommandLineArguments'
- poolDictionaries:''
- category:'System-Support'
+ instanceVariableNames:''
+ classVariableNames:'Verbose CommandLineArguments'
+ poolDictionaries:''
+ category:'System-Support'
!
StandaloneStartup class instanceVariableNames:'MutexHandle'
@@ -813,7 +813,8 @@
!
startupFilename
- "used in verbose messages - can/should be redefined in subclasses"
+ "used in verbose messages - can/should be redefined in subclasses.
+ Only return a basename here."
^ self applicationName asLowercase,'Start.rc'
@@ -845,15 +846,20 @@
rcFilename isNil ifTrue:[
rcFilename := self startupFilename.
+
].
- rcFilename asFilename exists ifTrue:[
- self verboseInfo:('reading ',rcFilename,'...').
- rcFilename asFilename isAbsolute ifFalse:[
- rcFilename := OperatingSystem pathOfSTXExecutable asFilename directory constructString:rcFilename.
+ rcFilename notNil ifTrue:[
+ rcFilename asFilename exists ifFalse:[
+ rcFilename asFilename isAbsolute ifFalse:[
+ rcFilename := OperatingSystem pathOfSTXExecutable asFilename directory constructString:rcFilename.
+ ].
].
- Smalltalk secureFileIn:rcFilename
+ rcFilename asFilename exists ifTrue:[
+ self verboseInfo:('reading ',rcFilename,'...').
+ Smalltalk secureFileIn:rcFilename
+ ].
].
-
+
"Created: / 24-05-2011 / 16:13:34 / cg"
"Modified: / 06-07-2018 / 16:38:13 / Claus Gittinger"
!