From 614f79f7c6550de6802dad1d61f37eb5c8f6f11f Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 9 Oct 2021 12:59:22 -0700 Subject: rename :XDG-CACHE-HOME connattr to :XDG_CACHE_HOME Signed-off-by: Sean Whitton --- src/connection.lisp | 4 ++-- src/connection/chroot.lisp | 2 +- src/connection/local.lisp | 2 +- src/connection/setuid.lisp | 2 +- src/image.lisp | 2 +- src/property/installer.lisp | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/connection.lisp b/src/connection.lisp index 370d146..9a7584f 100644 --- a/src/connection.lisp +++ b/src/connection.lisp @@ -245,7 +245,7 @@ login(1)). Tilde expansion works correctly." (ensure-directory-pathname (stripln home))))) (defmethod connection-connattr - ((connection connection) (k (eql :XDG-CACHE-HOME))) + ((connection connection) (k (eql :XDG_CACHE_HOME))) (let ((env (stripln (connection-run connection "echo $XDG_CACHE_HOME" nil)))) (if (plusp (length env)) (ensure-directory-pathname env) @@ -255,7 +255,7 @@ login(1)). Tilde expansion works correctly." (defmethod connection-connattr ((connection connection) (k (eql :consfigurator-cache))) (merge-pathnames "consfigurator/" - (connection-connattr connection :XDG-CACHE-HOME))) + (connection-connattr connection :XDG_CACHE_HOME))) ;;;; Functions to access the slots of the current connection diff --git a/src/connection/chroot.lisp b/src/connection/chroot.lisp index eb7d533..5c149e3 100644 --- a/src/connection/chroot.lisp +++ b/src/connection/chroot.lisp @@ -103,7 +103,7 @@ should be the mount point, without the chroot's root prefixed.") ;; in UPLOAD-ALL-PREREQUISITE-DATA. (connection-connattr connection :remote-home) ;; Obtain & cache XDG_CACHE_HOME inside the chroot, and compute DATADIR. - (let ((xdg-cache-home (connection-connattr connection :XDG-CACHE-HOME))) + (let ((xdg-cache-home (connection-connattr connection :XDG_CACHE_HOME))) (setf connection (change-class connection 'chroot.fork-connection) (slot-value connection 'datadir) (merge-pathnames diff --git a/src/connection/local.lisp b/src/connection/local.lisp index 1d70adc..2c79036 100644 --- a/src/connection/local.lisp +++ b/src/connection/local.lisp @@ -81,5 +81,5 @@ (detype-pathname temp) (detype-pathname path))))) (defmethod connection-connattr - ((connection local-connection) (k (eql :XDG-CACHE-HOME))) + ((connection local-connection) (k (eql :XDG_CACHE_HOME))) (uiop:xdg-cache-home)) diff --git a/src/connection/setuid.lisp b/src/connection/setuid.lisp index 1f85160..59622dd 100644 --- a/src/connection/setuid.lisp +++ b/src/connection/setuid.lisp @@ -44,7 +44,7 @@ :remote-user ,(cdr (assoc :name ent)) :remote-home ,(ensure-directory-pathname (cdr (assoc :home ent))) - :XDG-CACHE-HOME ,xdg-cache-home)) + :XDG_CACHE_HOME ,xdg-cache-home)) remaining))) (defmethod post-fork ((connection setuid-connection)) diff --git a/src/image.lisp b/src/image.lisp index 24b08b3..aa1a4b2 100644 --- a/src/image.lisp +++ b/src/image.lisp @@ -145,7 +145,7 @@ already running from FILENAME." (let ((file (or filename (ensure-directories-exist (merge-pathnames "consfigurator/images/latest" - (get-connattr :XDG-CACHE-HOME)))))) + (get-connattr :XDG_CACHE_HOME)))))) (unless (and (not always) (eql :linux (uiop:operating-system)) (pathname-equal file (resolve-symlinks "/proc/self/exe"))) diff --git a/src/property/installer.lisp b/src/property/installer.lisp index fbe574b..a41112f 100644 --- a/src/property/installer.lisp +++ b/src/property/installer.lisp @@ -266,14 +266,14 @@ using a combinator like ON-CHANGE, or applied manually with DEPLOY-THESE." (let ((source (chroot-pathname (merge-pathnames - "consfigurator/" (get-connattr :XDG-CACHE-HOME)) + "consfigurator/" (get-connattr :XDG_CACHE_HOME)) old-os))) (when (directory-exists-p source) (rename-file source (ensure-directories-exist #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") -- cgit v1.2.3