smalltalk.rc
changeset 782 035c101ce005
parent 781 a40503a94982
child 924 5141db35696d
--- a/smalltalk.rc	Tue Jan 16 12:13:39 2007 +0100
+++ b/smalltalk.rc	Wed Jan 17 12:26:05 2007 +0100
@@ -105,7 +105,10 @@
 "/ 'exec: ' infoPrint. OperatingSystem nameOfSTXExecutable infoPrintCR.
 "/ 'execPath: ' infoPrint. OperatingSystem pathOfSTXExecutable infoPrintCR.
 
-pathOfSTXExecutable := OperatingSystem pathOfSTXExecutable asFilename directory.
+pathOfSTXExecutable := OperatingSystem pathOfSTXExecutable.
+pathOfSTXExecutable notNil ifTrue:[
+    pathOfSTXExecutable := pathOfSTXExecutable asFilename directory.
+].
 pathOfCurrentDir := Filename currentDirectory asAbsoluteFilename.
 
 (path := OperatingSystem getEnvironment:'STX_SYSTEMPATH') notNil ifTrue:[
@@ -119,9 +122,10 @@
 	('smalltalk.rc [info]: found gnu-smalltalk sources in ' , path , '; removed from systemPath.') infoPrintCR.
 	Smalltalk systemPath:(Smalltalk systemPath remove:path; yourself).
     ].
-
-    (Smalltalk systemPath includes:pathOfSTXExecutable name) ifFalse:[
-	Smalltalk systemPath addFirst:pathOfSTXExecutable name.
+    pathOfSTXExecutable notNil ifTrue:[
+	(Smalltalk systemPath includes:pathOfSTXExecutable name) ifFalse:[
+	    Smalltalk systemPath addFirst:pathOfSTXExecutable name.
+	]
     ].
     (Smalltalk systemPath includes:pathOfCurrentDir name) ifFalse:[
 	Smalltalk systemPath addFirst:pathOfCurrentDir name.
@@ -145,7 +149,8 @@
     "/ if running in the development environment,
     "/ only use the local packages.
     "/
-    (pathOfSTXExecutable construct:'../../../stx/projects/smalltalk') exists ifTrue:[
+    (pathOfSTXExecutable notNil
+    and:[(pathOfSTXExecutable construct:'../../../stx/projects/smalltalk') exists]) ifTrue:[
 	Smalltalk packagePath removeAll; add:(pathOfSTXExecutable construct:'../../..') pathName.
 	'smalltalk.rc [info]: setting packagePath for local operation' infoPrintCR.
     ] ifFalse:[