--- a/Smalltalk.st Thu Oct 25 02:18:15 2018 +0200
+++ b/Smalltalk.st Thu Oct 25 11:09:59 2018 +0200
@@ -7740,16 +7740,26 @@
<pkg>/resources/file
"
- |pF f dir packageDir|
+ |pF f dir packageDir possibleResourceDirs|
f := aFileName asString withoutPrefix:'resources/'.
+ OperatingSystem isOSXlike ifTrue:[
+ possibleResourceDirs := #('../Resources' '.resources' 'resources').
+ ] ifFalse:[
+ OperatingSystem isMSWINDOWSlike ifTrue:[
+ possibleResourceDirs := #('resources').
+ ] ifFalse:[
+ possibleResourceDirs := #('.resources' 'resources').
+ ].
+ ].
+
aPackageIDOrNil isNil ifTrue:[
"/ this will be an error in the future
"/ 'Smalltalk [warning]: resource file access without package: ' infoPrint. aFileName infoPrintCR.
"/ self halt.
- #('../Resources' '.resources' 'resources') do:[:eachPossibleRsrcDir |
+ possibleResourceDirs do:[:eachPossibleRsrcDir |
pF := self searchPath:(self realSystemPath)
for:aFileName
in:(eachPossibleRsrcDir).
@@ -7779,7 +7789,7 @@
^ pF.
].
- #('../Resources' '.resources' 'resources') do:[:eachPossibleRsrcDir |
+ possibleResourceDirs do:[:eachPossibleRsrcDir |
pF := self searchPath:(self realSystemPath)
for:aFileName
in:(eachPossibleRsrcDir,'/',packageDir).
@@ -7813,6 +7823,7 @@
"
"Modified: / 11-10-2006 / 13:53:43 / cg"
+ "Modified: / 25-10-2018 / 10:00:30 / Claus Gittinger"
!
getSourceFileName:aFileName