From 4e0a4c107e4a2ee708e6e7a9f3edf189fe858f14 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 11 Mar 2022 15:27:00 -0700 Subject: replace ESCAPE-SH-TOKEN and ESCAPE-SH-COMMAND with new SH-ESCAPE Signed-off-by: Sean Whitton --- src/property/cron.lisp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/property/cron.lisp') 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 -- cgit v1.2.3