diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 15:27:00 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-11 16:40:08 -0700 |
| commit | 4e0a4c107e4a2ee708e6e7a9f3edf189fe858f14 (patch) | |
| tree | b8e51af43f895a98ebd943580c51c1da38151bdf /src/data.lisp | |
| parent | f2ba47b7ef017a01a4b6c13982ff43a67cc6abd5 (diff) | |
| download | consfigurator-4e0a4c107e4a2ee708e6e7a9f3edf189fe858f14.tar.gz | |
replace ESCAPE-SH-TOKEN and ESCAPE-SH-COMMAND with new SH-ESCAPE
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/data.lisp')
| -rw-r--r-- | src/data.lisp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/data.lisp b/src/data.lisp index 1b74338..307d0c1 100644 --- a/src/data.lisp +++ b/src/data.lisp @@ -307,8 +307,7 @@ implementation.")) (let ((destfile (strcat destfile ".gz"))) (with-temporary-file (:pathname tmp) (run-program - (strcat "gzip -c " (escape-sh-token source)) - :output tmp) + (strcat "gzip -c " (sh-escape source)) :output tmp) (upload tmp destfile) (mrun "gunzip" destfile))) (upload source destfile))))))))) @@ -370,11 +369,10 @@ CONTINUE-DEPLOY* or CONTINUE-DEPLOY*-PROGRAM." else do (error 'missing-data :iden1 iden1 :iden2 iden2)))) (defun try-get-file-mime-type (file) - (handler-case (stripln (run-program - (escape-sh-command (list "file" "-E" - "--mime-type" "--brief" - (unix-namestring file))) - :output :string)) + (handler-case (stripln + (run-program + (sh-escape `("file" "-E" "--mime-type" "--brief" ,file)) + :output :string)) (subprocess-error () nil))) (defun sort-prerequisite-data-cache (cache) |