diff options
Diffstat (limited to 'src/property')
| -rw-r--r-- | src/property/cmd.lisp | 2 | ||||
| -rw-r--r-- | src/property/cron.lisp | 7 | ||||
| -rw-r--r-- | src/property/file.lisp | 3 | ||||
| -rw-r--r-- | src/property/installer.lisp | 2 | ||||
| -rw-r--r-- | src/property/libvirt.lisp | 2 |
5 files changed, 7 insertions, 9 deletions
diff --git a/src/property/cmd.lisp b/src/property/cmd.lisp index 1f46b60..bc9fd80 100644 --- a/src/property/cmd.lisp +++ b/src/property/cmd.lisp @@ -31,7 +31,7 @@ Keyword argument :ENV is a plist of environment variables to be set when running the command, using env(1)." (:desc (loop for arg in args if (stringp arg) - collect (escape-sh-token arg) into accum + collect (sh-escape arg) into accum else collect (prin1-to-string arg) into accum finally (return (format nil "~{~A~^ ~}" accum)))) (:apply (apply #'mrun args))) diff --git a/src/property/cron.lisp b/src/property/cron.lisp index 3a1343a..959f190 100644 --- a/src/property/cron.lisp +++ b/src/property/cron.lisp @@ -41,7 +41,7 @@ The output of the cronjob will be mailed only if the job exits nonzero." (job (merge-pathnames (string->filename desc) dir)) (script (merge-pathnames (strcat (string->filename desc) "_cronjob") #P"/usr/local/bin/")) - (script* (escape-sh-token (unix-namestring script)))) + (script* (sh-escape script))) `(with-unapply (apt:service-installed-running "cron") (apt:installed "moreutils") @@ -67,8 +67,7 @@ The output of the cronjob will be mailed only if the job exits nonzero." ;; Use flock(1) to ensure that only one instance of the job is ever ;; running, no matter how long one run of the job takes. ,(format nil "flock -n ~A sh -c ~A" - (escape-sh-token (unix-namestring job)) - (escape-sh-token shell-command))) + (sh-escape job) (sh-escape shell-command))) :mode #o755) :unapply (file:does-not-exist ,job ,script)))) @@ -76,7 +75,7 @@ The output of the cronjob will be mailed only if the job exits nonzero." "Like CRON:SYSTEM-JOB, but run the command niced and ioniced." (:desc #?"Cronned ${desc}, niced and ioniced") (system-job desc when user (format nil "nice ionice -c 3 sh -c ~A" - (escape-sh-token shell-command)))) + (sh-escape shell-command)))) (defproplist runs-consfigurator :lisp (when) "Re-execute the most recent deployment that included an application of this diff --git a/src/property/file.lisp b/src/property/file.lisp index 26ce4a1..d9ca42a 100644 --- a/src/property/file.lisp +++ b/src/property/file.lisp @@ -430,8 +430,7 @@ commented out; the first commented or uncommented line for each key will be uncommented and used to set the value, if it exists." (:desc (format nil "~A has ~{~A=~S~^, ~}" file pairs)) (:apply (simple-conf-update file (loop for (k v) on pairs by #'cddr - collect k - collect (escape-sh-token v)) + collect k collect (sh-escape v)) ;; include quoting as part of the value so we ;; don't end up substituting double quotation ;; marks for single, or similar diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 5a120f9..64d76e1 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -191,7 +191,7 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." if (pathnamep arg) collect (unix-namestring arg) else collect arg) - (foreign-funcall "system" :string (escape-sh-command it) :int))) + (foreign-funcall "system" :string (sh-escape it) :int))) (preservedp (pathname) (member pathname preserved-directories :test #'pathname-equal))) (mount:assert-devtmpfs-udev-/dev) diff --git a/src/property/libvirt.lisp b/src/property/libvirt.lisp index 967d76c..fff40d1 100644 --- a/src/property/libvirt.lisp +++ b/src/property/libvirt.lisp @@ -87,7 +87,7 @@ subcommand of virsh(1) to convert the running domain into a transient domain." nil "virt-install --print-xml -n ~A~:[~; --os-variant=~:*~A~]~{ ~A~} >~S" (get-hostname host) (os-variant host) - (mapcar #'escape-sh-token arguments) file)) + (mapcar #'sh-escape arguments) file)) (mrun "virsh" "define" file))) (:unapply (declare (ignore arguments)) |