Mercurial Mercurial > hg > stx-libwidg2 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
checkin from browser
authorClaus Gittinger <cg@exept.de>
Fri, 03 Dec 1999 19:09:03 +0100
changeset 1626 614d6e8db98d
parent 1625 d24f2cb25abc
child 1627 7bfaaad36045
checkin from browser
LicenceBox.st file | annotate | diff | comparison | revisions 
--- a/LicenceBox.st	Fri Dec 03 15:59:17 1999 +0100
+++ b/LicenceBox.st	Fri Dec 03 19:09:03 1999 +0100
@@ -225,39 +225,42 @@
 licenceFile
     "get filename of licence file"
 
-    |fn|
+    |relName|
 
     fileName isNil ifTrue:[
-	fileName := fn := resources at:'LICENCEFILE' default:nil.
-	fileName isNil ifTrue:[
-	    Smalltalk releaseIdentification = 'ST/X_free_demo_vsn' ifTrue:[
-		fn := 'doc/online/english/LICENCE_DEMO_STX.html'.
-	    ] ifFalse:[
-		fn := 'doc/online/english/LICENCE_STX.html'.
-	    ].
-	    fileName := fn.
-	].
+        fileName := relName := resources at:'LICENCEFILE' default:nil.
+        fileName isNil ifTrue:[
+            Smalltalk releaseIdentification = 'ST/X_free_demo_vsn' ifTrue:[
+                relName := 'doc/online/english/LICENCE_DEMO_STX.html'.
+            ] ifFalse:[
+                relName := 'doc/online/english/LICENCE_STX.html'.
+            ].
+            fileName := relName.
+        ].
 
-	fileName asFilename exists ifFalse:[
-	    fileName := Smalltalk getSystemFileName:fileName.
-	    fileName isNil ifTrue:[
-		fileName := '../../' , fn.
-		fileName asFilename exists ifFalse:[
-		    fileName := Smalltalk getSystemFileName:'doc/online/german/LICENCE_STX.html'.
-		    fileName isNil ifTrue:[
-			fileName := '../../doc/online/german/LICENCE_STX.html'.
-		    ]
-		].
-	    ].
-	].
-	fileName asFilename exists ifFalse:[
-	    fileName := nil
-	].
+        fileName asFilename exists ifFalse:[
+            fileName := Smalltalk getSystemFileName:relName.
+            fileName isNil ifTrue:[
+                fileName := Smalltalk getSystemFileName:('../' , relName).
+                fileName isNil ifTrue:[
+                    fileName := Smalltalk getSystemFileName:('../../' , relName).
+                    fileName isNil ifTrue:[
+                        fileName := Smalltalk getSystemFileName:'doc/online/german/LICENCE_STX.html'.
+                        fileName isNil ifTrue:[
+                            fileName := '../../doc/online/german/LICENCE_STX.html'.
+                        ]
+                    ]
+                ].
+            ].
+        ].
+        fileName asFilename exists ifFalse:[
+            fileName := nil
+        ].
     ].
     ^ fileName 
 
     "
-     LicenceBox new licenceFile
+     LicenceBox new licenceFile 
     "
 
     "Modified: / 23.4.1998 / 11:40:25 / cg"
@@ -300,6 +303,6 @@
 !LicenceBox class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/LicenceBox.st,v 1.16 1999-05-06 09:23:30 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/LicenceBox.st,v 1.17 1999-12-03 18:09:03 cg Exp $'
 ! !
 LicenceBox initialize!
hg/stx-libwidg2