diff --git a/basis/bootstrap/finish-bootstrap.factor b/basis/bootstrap/finish-bootstrap.factor index 70ccaedad4..387903d1e9 100644 --- a/basis/bootstrap/finish-bootstrap.factor +++ b/basis/bootstrap/finish-bootstrap.factor @@ -8,9 +8,14 @@ namespaces eval kernel vocabs.loader io ; (command-line) parse-command-line load-vocab-roots run-user-init - "e" get [ eval( -- ) ] when* - ignore-cli-args? not script get and - [ run-script ] [ "run" get run ] if* + + "e" get script get or [ + "e" get [ eval( -- ) ] when* + script get [ run-script ] when* + ] [ + "run" get run + ] if + output-stream get [ stream-flush ] when* 0 exit ] [ print-error 1 exit ] recover diff --git a/basis/command-line/command-line-docs.factor b/basis/command-line/command-line-docs.factor index 697f95b14f..11ee46c227 100644 --- a/basis/command-line/command-line-docs.factor +++ b/basis/command-line/command-line-docs.factor @@ -37,10 +37,6 @@ HELP: main-vocab HELP: default-cli-args { $description "Sets global variables corresponding to default command line arguments." } ; -HELP: ignore-cli-args? -{ $values { "?" "a boolean" } } -{ $description "On Mac OS X, source files to run are supplied by the Cocoa API, so to avoid running them twice the startup code has to call this word." } ; - ARTICLE: "runtime-cli-args" "Command line switches for the VM" "A handful of command line switches are processed by the VM and not the library. They control low-level features." { $table diff --git a/basis/command-line/command-line.factor b/basis/command-line/command-line.factor index 939fb82f00..643afef669 100644 --- a/basis/command-line/command-line.factor +++ b/basis/command-line/command-line.factor @@ -67,7 +67,4 @@ SYMBOL: main-vocab-hook main-vocab "run" set ] bind ; -: ignore-cli-args? ( -- ? ) - os macosx? "run" get "ui" = and ; - [ default-cli-args ] "command-line" add-startup-hook