[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] support: Rename user-dmddir to %user-shepherd-dir.
From: |
Mathieu Lirzin |
Subject: |
[PATCH 3/3] support: Rename user-dmddir to %user-shepherd-dir. |
Date: |
Sat, 16 Jan 2016 23:17:41 +0100 |
* modules/shepherd/support.scm (user-dmddir): Rename to ...
(%user-shepherd-dir): ... this. Honor XDG variables and use
'~/.config/shepherd' as default value. All consumers changed.
(mkdir-p): New procedure. Export it.
(default-config-file): Use it.
(verify-dir): Likewise.
---
modules/shepherd/support.scm | 45 ++++++++++++++++++++++++++++++++++++--------
1 file changed, 37 insertions(+), 8 deletions(-)
diff --git a/modules/shepherd/support.scm b/modules/shepherd/support.scm
index b6af5eb..4591e65 100644
--- a/modules/shepherd/support.scm
+++ b/modules/shepherd/support.scm
@@ -32,6 +32,7 @@
with-system-error-handling
EINTR-safe
with-atomic-file-output
+ mkdir-p
l10n
local-output
@@ -155,6 +156,31 @@ output port, and PROC's result is returned."
(lambda (key . args)
(catch-system-error (delete-file template))))))
+(define* (mkdir-p dir #:optional (mode (umask))) ;copied from Guix
+ "Create directory DIR and all its ancestors."
+ (define absolute?
+ (string-prefix? "/" dir))
+
+ (define not-slash
+ (char-set-complement (char-set #\/)))
+
+ (let loop ((components (string-tokenize dir not-slash))
+ (root (if absolute?
+ ""
+ ".")))
+ (match components
+ ((head tail ...)
+ (let ((path (string-append root "/" head)))
+ (catch 'system-error
+ (lambda ()
+ (mkdir path mode)
+ (loop tail path))
+ (lambda args
+ (if (= EEXIST (system-error-errno args))
+ (loop tail path)
+ (apply throw args))))))
+ (() #t))))
+
;; Localized version of STR.
@@ -186,8 +212,11 @@ There is NO WARRANTY, to the extent permitted by law.")))
(false-if-exception (passwd:dir (getpwuid (getuid))))
"/"))
-;; dmd default subdirectory if dmd is run as a normal user.
-(define user-dmddir (string-append user-homedir "/.dmd.d"))
+(define %user-shepherd-dir
+ ;; sheperd default directory if shepherd is run as a normal user.
+ (string-append (or (getenv "XDG_CONFIG_HOME")
+ (string-append user-homedir "/.config"))
+ "/shepherd"))
(define (make-bare-init-file target)
"Return #t if a bare init file was created at TARGET; #f otherwise.
@@ -216,7 +245,7 @@ TARGET should be a string representing a filepath + name."
(define default-logfile
(if (zero? (getuid))
(string-append %localstatedir "/log/shepherd.log")
- (string-append user-dmddir "/shepherd.log")))
+ (string-append %user-shepherd-dir "/shepherd.log")))
;; Configuration file.
(define (default-config-file)
@@ -225,8 +254,8 @@ global system configuration file when running as 'root'.
As a side effect,
create a template configuration file if non exists."
(if (zero? (getuid))
(string-append %sysconfdir "/dmdconf.scm")
- (let ((config-file (string-append user-dmddir "/init.scm")))
- (catch-system-error (mkdir user-dmddir))
+ (let ((config-file (string-append %user-shepherd-dir "/init.scm")))
+ (mkdir-p %user-shepherd-dir #o700)
(if (not (file-exists? config-file))
(make-bare-init-file config-file))
config-file)))
@@ -239,7 +268,7 @@ create a template configuration file if non exists."
(define default-socket-dir
(if (zero? (getuid))
%system-socket-dir
- (string-append user-dmddir "/run")))
+ (string-append %user-shepherd-dir "/run")))
;; Unix domain socket for receiving commands in dmd.
(define default-socket-file
@@ -253,7 +282,7 @@ create a template configuration file if non exists."
(define default-persistency-state-file
(if (zero? (getuid))
(string-append %localstatedir "/lib/misc/dmd-state")
- (string-append user-dmddir "/dmd-state")))
+ (string-append %user-shepherd-dir "/dmd-state")))
;; Global variables set from (dmd).
(define persistency #f)
@@ -284,7 +313,7 @@ directory are not checked."
(and (string=? dir default-socket-dir)
;; If it exists already, this is fine, thus ignore errors.
(catch-system-error
- (mkdir default-socket-dir #o700)))
+ (mkdir-p default-socket-dir #o700)))
;; Check for permissions.
(when secure?
(let ((dir-stat (stat dir)))