Mercurial Mercurial > hg > stx-libbasic / 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.
class: UnixOperatingSystem
authorClaus Gittinger <cg@exept.de>
Sun, 29 Jun 2014 10:46:36 +0200
changeset 16645 1888b2ecfd66
parent 16644 c8e610a071c3
child 16646 eb3524f545f4
class: UnixOperatingSystem changed: #defaultSystemPath
UnixOperatingSystem.st file | annotate | diff | comparison | revisions 
--- a/UnixOperatingSystem.st	Sun Jun 29 10:46:11 2014 +0200
+++ b/UnixOperatingSystem.st	Sun Jun 29 10:46:36 2014 +0200
@@ -8772,38 +8772,42 @@
 
     sysPath := super defaultSystemPath.
     #(
-	'/usr/local/lib/stx'
-	'/usr/local/lib/smalltalk'
-	'/usr/lib/stx'
-	'/usr/lib/smalltalk'
-	'/lib/stx'
-	'/lib/smalltalk'
-	'/opt/stx'
-	'/opt/smalltalk'
+        '/usr/local/lib/stx'
+        '/usr/local/lib/smalltalk'
+        '/usr/local/lib/smalltalk-x'
+        '/usr/lib/stx'
+        '/usr/lib/smalltalk'
+        '/usr/lib/smalltalk-x'
+        '/lib/stx'
+        '/lib/smalltalk'
+        '/lib/smalltalk-x'
+        '/opt/stx'
+        '/opt/smalltalk'
+        '/opt/smalltalk-x'
     ) do:[:dirName |
-	|dir|
-
-	dir := dirName asFilename.
-	(dir isDirectory) ifTrue:[
-	    "/ try to guess a gnu-smalltalk; skip it
-	    (dir construct:'initialize.st') exists ifFalse:[
-		releaseFile := dir construct:'RELEASE'.
-		releaseFile exists ifTrue:[
-		    s := releaseFile readStreamOrNil.
-		    s notNil ifTrue:[
-			v := Integer readFrom:s onError:-1.
-			s close.
-			v == majorVersionNr ifTrue:[
-			    sysPath add:dirName
-			] ifFalse:[
-			    ('UnixOperatingSystem [info]: ignore files in ' , dir pathName , ' (RELEASE mismatch)') infoPrintCR.
-			]
-		    ] ifFalse:[
-			('UnixOperatingSystem [info]: ignore files in ' , dir pathName , ' (RELEASE missing)') infoPrintCR.
-		    ]
-		]
-	    ]
-	]
+        |dir|
+
+        dir := dirName asFilename.
+        (dir isDirectory) ifTrue:[
+            "/ try to guess a gnu-smalltalk; skip it
+            (dir construct:'initialize.st') exists ifFalse:[
+                releaseFile := dir construct:'RELEASE'.
+                releaseFile exists ifTrue:[
+                    s := releaseFile readStreamOrNil.
+                    s notNil ifTrue:[
+                        v := Integer readFrom:s onError:-1.
+                        s close.
+                        v == majorVersionNr ifTrue:[
+                            sysPath add:dirName
+                        ] ifFalse:[
+                            ('UnixOperatingSystem [info]: ignore files in ' , dir pathName , ' (RELEASE mismatch)') infoPrintCR.
+                        ]
+                    ] ifFalse:[
+                        ('UnixOperatingSystem [info]: ignore files in ' , dir pathName , ' (RELEASE missing)') infoPrintCR.
+                    ]
+                ]
+            ]
+        ]
     ].
     ^ sysPath
 
@@ -13269,11 +13273,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.369 2014-06-25 16:25:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.370 2014-06-29 08:46:36 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.369 2014-06-25 16:25:06 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.370 2014-06-29 08:46:36 cg Exp $'
 ! !
hg/stx-libbasic