diff options
author | Sean Whitton <spwhitton@spwhitton.name> | 2021-10-09 12:55:46 -0700 |
---|---|---|
committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-10-23 12:30:17 -0700 |
commit | dee05622a94e2803d232892b376aba70328c21e6 (patch) | |
tree | bc51a8edee0db1a3f0109e40ca760997ac3a45e0 /src/property | |
parent | 720ee21a0905d36cf29af49ce8b6d572296dddb6 (diff) | |
download | consfigurator-dee05622a94e2803d232892b376aba70328c21e6.tar.gz |
replace some functions with a new :CONSFIGURATOR-CACHE connattr
This simplifies the API.
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
-rw-r--r-- | src/property/file.lisp | 3 | ||||
-rw-r--r-- | src/property/installer.lisp | 3 | ||||
-rw-r--r-- | src/property/periodic.lisp | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/property/file.lisp b/src/property/file.lisp index 9c4ad7d..0d89d82 100644 --- a/src/property/file.lisp +++ b/src/property/file.lisp @@ -166,7 +166,8 @@ any of the regular expressions PATTERNS." (defprop data-cache-purged :posix () "Ensure that any prerequisite data cached in the remote home directory is removed." (:desc "Consfigurator data cache cleaned") - (:apply (directory-does-not-exist (get-remote-data-cache-dir)))) + (:apply (directory-does-not-exist + (merge-pathnames "data/" (get-connattr :consfigurator-cache))))) (defprop regex-replaced-lines :posix (file regex replace) "Like s/REGEX/REPLACE/ on the lines of FILE. diff --git a/src/property/installer.lisp b/src/property/installer.lisp index 5e68e4f..fbe574b 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -273,7 +273,8 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." #P"/root/.cache/consfigurator/")))) (setf (get-connattr :remote-user) "root" (get-connattr :remote-home) "/root" - (get-connattr :XDG-CACHE-HOME) #P"/root/.cache/") + (get-connattr :XDG-CACHE-HOME) #P"/root/.cache/" + (get-connattr :consfigurator-cache) #P"/root/.cache/consfigurator/") (posix-login-environment "root" "/root") ;; Remount (mainly virtual) filesystems that other properties we will diff --git a/src/property/periodic.lisp b/src/property/periodic.lisp index 6c0eab3..437ed41 100644 --- a/src/property/periodic.lisp +++ b/src/property/periodic.lisp @@ -42,7 +42,8 @@ user." (symbol-macrolet ((flagfile (merge-pathnames (string->filename desc) - (remote-consfigurator-cache-pathname "at-most/")))) + (merge-pathnames "at-most/" + (get-connattr :consfigurator-cache))))) (destructuring-bind (psym . args) propapp (:retprop :type (propapptype propapp) :desc (lambda-ignoring-args desc) |