diff --git a/src/electron/electron/handler.cljs b/src/electron/electron/handler.cljs index 9738d19419f..0aaddb2453a 100644 --- a/src/electron/electron/handler.cljs +++ b/src/electron/electron/handler.cljs @@ -470,7 +470,7 @@ deferred (p/deferred) on-exit-handler (fn [code] (p/resolve! deferred code)) - _job (shell/run-command-safety! command args on-data-handler on-exit-handler)] + _job (shell/run-command-safely! command args on-data-handler on-exit-handler)] deferred) (catch js/Error e (utils/send-to-renderer window "notification" diff --git a/src/electron/electron/shell.cljs b/src/electron/electron/shell.cljs index 80ed866016f..c781529ae1b 100644 --- a/src/electron/electron/shell.cljs +++ b/src/electron/electron/shell.cljs @@ -37,15 +37,15 @@ [command] (when-not (some->> command (.sync command-exists)) - (throw (js/Error. (str "Shell: " command " not exist!")))) command) + (throw (js/Error. (str "Shell: " command " does not exist!")))) command) (defn- ensure-command-in-allowlist [command] (when-not (some->> command (contains? (get-commands-allowlist))) - (throw (js/Error. (str "Shell: " command " not be allowed!")))) command) + (throw (js/Error. (str "Shell: " command " is not allowed!")))) command) -(defn run-command-safety! +(defn run-command-safely! [command args on-data on-exit] (when (some-> command str string/trim string/lower-case (ensure-command-exists)