Use safer detection of process command
This commit is contained in:
Michiel Borkent
parent
5ab8b3f975
commit
ccebfa630f
1 changed files with 99 additions and 99 deletions
|
|
@ -333,20 +333,20 @@ Use bb run --help to show this help output.
|
||||||
|
|
||||||
(def aliases
|
(def aliases
|
||||||
(cond->
|
(cond->
|
||||||
'{str clojure.string
|
'{str clojure.string
|
||||||
set clojure.set
|
set clojure.set
|
||||||
tools.cli clojure.tools.cli
|
tools.cli clojure.tools.cli
|
||||||
edn clojure.edn
|
edn clojure.edn
|
||||||
wait babashka.wait
|
wait babashka.wait
|
||||||
signal babashka.signal
|
signal babashka.signal
|
||||||
shell clojure.java.shell
|
shell clojure.java.shell
|
||||||
io clojure.java.io
|
io clojure.java.io
|
||||||
json cheshire.core
|
json cheshire.core
|
||||||
curl babashka.curl
|
curl babashka.curl
|
||||||
fs babashka.fs
|
fs babashka.fs
|
||||||
bencode bencode.core
|
bencode bencode.core
|
||||||
deps babashka.deps
|
deps babashka.deps
|
||||||
async clojure.core.async}
|
async clojure.core.async}
|
||||||
features/xml? (assoc 'xml 'clojure.data.xml)
|
features/xml? (assoc 'xml 'clojure.data.xml)
|
||||||
features/yaml? (assoc 'yaml 'clj-yaml.core)
|
features/yaml? (assoc 'yaml 'clj-yaml.core)
|
||||||
features/jdbc? (assoc 'jdbc 'next.jdbc)
|
features/jdbc? (assoc 'jdbc 'next.jdbc)
|
||||||
|
|
@ -366,72 +366,72 @@ Use bb run --help to show this help output.
|
||||||
|
|
||||||
(def namespaces
|
(def namespaces
|
||||||
(cond->
|
(cond->
|
||||||
{'user {'*input* (reify
|
{'user {'*input* (reify
|
||||||
sci-types/Eval
|
sci-types/Eval
|
||||||
(eval [_ _ctx _bindings]
|
(eval [_ _ctx _bindings]
|
||||||
(force @input-var)))}
|
(force @input-var)))}
|
||||||
'clojure.core core-extras
|
'clojure.core core-extras
|
||||||
'clojure.tools.cli tools-cli-namespace
|
'clojure.tools.cli tools-cli-namespace
|
||||||
'clojure.java.shell shell-namespace
|
'clojure.java.shell shell-namespace
|
||||||
'babashka.core bbcore/core-namespace
|
'babashka.core bbcore/core-namespace
|
||||||
'babashka.nrepl.server nrepl-server-namespace
|
'babashka.nrepl.server nrepl-server-namespace
|
||||||
'babashka.wait wait-namespace
|
'babashka.wait wait-namespace
|
||||||
'babashka.signal signal-ns
|
'babashka.signal signal-ns
|
||||||
'clojure.java.io io-namespace
|
'clojure.java.io io-namespace
|
||||||
'cheshire.core cheshire-core-namespace
|
'cheshire.core cheshire-core-namespace
|
||||||
'clojure.data data/data-namespace
|
'clojure.data data/data-namespace
|
||||||
'clojure.instant instant/instant-namespace
|
'clojure.instant instant/instant-namespace
|
||||||
'clojure.stacktrace stacktrace-namespace
|
'clojure.stacktrace stacktrace-namespace
|
||||||
'clojure.zip zip-namespace
|
'clojure.zip zip-namespace
|
||||||
'clojure.main {:obj clojure-main-ns
|
'clojure.main {:obj clojure-main-ns
|
||||||
'demunge (sci/copy-var demunge clojure-main-ns)
|
'demunge (sci/copy-var demunge clojure-main-ns)
|
||||||
'repl-requires (sci/copy-var clojure-main/repl-requires clojure-main-ns)
|
'repl-requires (sci/copy-var clojure-main/repl-requires clojure-main-ns)
|
||||||
'repl (sci/new-var 'repl
|
'repl (sci/new-var 'repl
|
||||||
(fn [& opts]
|
(fn [& opts]
|
||||||
(let [opts (apply hash-map opts)]
|
(let [opts (apply hash-map opts)]
|
||||||
(repl/start-repl! (common/ctx) opts))) {:ns clojure-main-ns})
|
(repl/start-repl! (common/ctx) opts))) {:ns clojure-main-ns})
|
||||||
'with-bindings (sci/copy-var clojure-main/with-bindings clojure-main-ns)
|
'with-bindings (sci/copy-var clojure-main/with-bindings clojure-main-ns)
|
||||||
'repl-caught (sci/copy-var repl/repl-caught clojure-main-ns)
|
'repl-caught (sci/copy-var repl/repl-caught clojure-main-ns)
|
||||||
'with-read-known (sci/copy-var clojure-main/with-read-known clojure-main-ns)
|
'with-read-known (sci/copy-var clojure-main/with-read-known clojure-main-ns)
|
||||||
'main main-var}
|
'main main-var}
|
||||||
'clojure.test t/clojure-test-namespace
|
'clojure.test t/clojure-test-namespace
|
||||||
'clojure.math math-namespace
|
'clojure.math math-namespace
|
||||||
'clojure.java.process cjp-namespace
|
'clojure.java.process cjp-namespace
|
||||||
'babashka.classpath classpath-namespace
|
'babashka.classpath classpath-namespace
|
||||||
'babashka.classes classes-namespace
|
'babashka.classes classes-namespace
|
||||||
'clojure.pprint pprint-namespace
|
'clojure.pprint pprint-namespace
|
||||||
'babashka.curl curl-namespace
|
'babashka.curl curl-namespace
|
||||||
'babashka.fs fs-namespace
|
'babashka.fs fs-namespace
|
||||||
'babashka.pods pods/pods-namespace
|
'babashka.pods pods/pods-namespace
|
||||||
'bencode.core bencode-namespace
|
'bencode.core bencode-namespace
|
||||||
'clojure.java.browse browse-namespace
|
'clojure.java.browse browse-namespace
|
||||||
'clojure.datafy datafy-namespace
|
'clojure.datafy datafy-namespace
|
||||||
'clojure.core.protocols protocols-namespace
|
'clojure.core.protocols protocols-namespace
|
||||||
'babashka.process process-namespace
|
'babashka.process process-namespace
|
||||||
'clojure.core.server clojure-core-server-namespace
|
'clojure.core.server clojure-core-server-namespace
|
||||||
'babashka.deps deps-namespace
|
'babashka.deps deps-namespace
|
||||||
'babashka.tasks tasks-namespace
|
'babashka.tasks tasks-namespace
|
||||||
'clojure.tools.reader.edn edn-namespace
|
'clojure.tools.reader.edn edn-namespace
|
||||||
'clojure.tools.reader.reader-types reader-types-namespace
|
'clojure.tools.reader.reader-types reader-types-namespace
|
||||||
'clojure.tools.reader reader-namespace
|
'clojure.tools.reader reader-namespace
|
||||||
'clojure.core.async async-namespace
|
'clojure.core.async async-namespace
|
||||||
'clojure.core.async.impl.protocols async-protocols-namespace
|
'clojure.core.async.impl.protocols async-protocols-namespace
|
||||||
'clojure.reflect reflect-namespace
|
'clojure.reflect reflect-namespace
|
||||||
'rewrite-clj.node rewrite/node-namespace
|
'rewrite-clj.node rewrite/node-namespace
|
||||||
'rewrite-clj.paredit rewrite/paredit-namespace
|
'rewrite-clj.paredit rewrite/paredit-namespace
|
||||||
'rewrite-clj.parser rewrite/parser-namespace
|
'rewrite-clj.parser rewrite/parser-namespace
|
||||||
'rewrite-clj.zip rewrite/zip-namespace
|
'rewrite-clj.zip rewrite/zip-namespace
|
||||||
'rewrite-clj.zip.subedit rewrite/subedit-namespace
|
'rewrite-clj.zip.subedit rewrite/subedit-namespace
|
||||||
'clojure.core.rrb-vector (if features/rrb-vector?
|
'clojure.core.rrb-vector (if features/rrb-vector?
|
||||||
@(resolve 'babashka.impl.rrb-vector/rrb-vector-namespace)
|
@(resolve 'babashka.impl.rrb-vector/rrb-vector-namespace)
|
||||||
{'catvec (sci/copy-var catvec
|
{'catvec (sci/copy-var catvec
|
||||||
(sci/create-ns 'clojure.core.rrb-vector))})
|
(sci/create-ns 'clojure.core.rrb-vector))})
|
||||||
'edamame.core edamame-namespace
|
'edamame.core edamame-namespace
|
||||||
'sci.core sci-core-namespace
|
'sci.core sci-core-namespace
|
||||||
'babashka.cli cli/cli-namespace
|
'babashka.cli cli/cli-namespace
|
||||||
'babashka.http-client http-client-namespace
|
'babashka.http-client http-client-namespace
|
||||||
'babashka.http-client.websocket http-client-websocket-namespace
|
'babashka.http-client.websocket http-client-websocket-namespace
|
||||||
'babashka.http-client.interceptors http-client-interceptors-namespace}
|
'babashka.http-client.interceptors http-client-interceptors-namespace}
|
||||||
features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)
|
features/xml? (assoc 'clojure.data.xml @(resolve 'babashka.impl.xml/xml-namespace)
|
||||||
'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace)
|
'clojure.data.xml.event @(resolve 'babashka.impl.xml/xml-event-namespace)
|
||||||
'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))
|
'clojure.data.xml.tree @(resolve 'babashka.impl.xml/xml-tree-namespace))
|
||||||
|
|
@ -469,7 +469,7 @@ Use bb run --help to show this help output.
|
||||||
@(resolve 'babashka.impl.clojure.test.check/test-check-namespace)
|
@(resolve 'babashka.impl.clojure.test.check/test-check-namespace)
|
||||||
;; it's better to load this from source by adding the clojure.test.check dependency
|
;; it's better to load this from source by adding the clojure.test.check dependency
|
||||||
#_#_'clojure.test.check.clojure-test
|
#_#_'clojure.test.check.clojure-test
|
||||||
@(resolve 'babashka.impl.clojure.test.check/test-check-clojure-test-namespace))
|
@(resolve 'babashka.impl.clojure.test.check/test-check-clojure-test-namespace))
|
||||||
features/spec-alpha? (-> (assoc ;; spec
|
features/spec-alpha? (-> (assoc ;; spec
|
||||||
'clojure.spec.alpha @(resolve 'babashka.impl.spec/spec-namespace)
|
'clojure.spec.alpha @(resolve 'babashka.impl.spec/spec-namespace)
|
||||||
'clojure.spec.gen.alpha @(resolve 'babashka.impl.spec/gen-namespace)
|
'clojure.spec.gen.alpha @(resolve 'babashka.impl.spec/gen-namespace)
|
||||||
|
|
@ -892,10 +892,10 @@ Use bb run --help to show this help output.
|
||||||
(let [loader @cp/the-url-loader]
|
(let [loader @cp/the-url-loader]
|
||||||
(or
|
(or
|
||||||
(when ;; ignore built-in namespaces when uberscripting, unless with :reload
|
(when ;; ignore built-in namespaces when uberscripting, unless with :reload
|
||||||
(and uberscript
|
(and uberscript
|
||||||
(not reload)
|
(not reload)
|
||||||
(or (contains? namespaces namespace)
|
(or (contains? namespaces namespace)
|
||||||
(contains? sci-namespaces/namespaces namespace)))
|
(contains? sci-namespaces/namespaces namespace)))
|
||||||
"")
|
"")
|
||||||
;; pod namespaces go before namespaces from source,
|
;; pod namespaces go before namespaces from source,
|
||||||
;; unless reload is used
|
;; unless reload is used
|
||||||
|
|
@ -1142,20 +1142,20 @@ Use bb run --help to show this help output.
|
||||||
|
|
||||||
(defn binary-invoked-as-jar []
|
(defn binary-invoked-as-jar []
|
||||||
(and (= "executable" (System/getProperty "org.graalvm.nativeimage.kind"))
|
(and (= "executable" (System/getProperty "org.graalvm.nativeimage.kind"))
|
||||||
(let [bin (-> (java.lang.ProcessHandle/current)
|
(when-let [bin (-> (java.lang.ProcessHandle/current)
|
||||||
.info
|
.info
|
||||||
.command
|
.command
|
||||||
.get)
|
(.orElse nil))]
|
||||||
fn (fs/file-name bin)]
|
(let [fn (fs/file-name bin)]
|
||||||
(if (= "bb" fn)
|
(if (= "bb" fn)
|
||||||
false
|
|
||||||
(if (and (fs/windows?)
|
|
||||||
(= "bb.exe" fn))
|
|
||||||
false
|
false
|
||||||
(when (try (with-open [_ (java.util.zip.ZipFile. (fs/file bin))])
|
(if (and (fs/windows?)
|
||||||
true
|
(= "bb.exe" fn))
|
||||||
(catch Exception _ false))
|
false
|
||||||
bin))))))
|
(when (try (with-open [_ (java.util.zip.ZipFile. (fs/file bin))])
|
||||||
|
true
|
||||||
|
(catch Exception _ false))
|
||||||
|
bin)))))))
|
||||||
|
|
||||||
(defn resolve-symbolic-link [f]
|
(defn resolve-symbolic-link [f]
|
||||||
(if (and f (fs/exists? f))
|
(if (and f (fs/exists? f))
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue