services: mpd: Provision a default cache directory and set HOME.
Relates to <https://issues.guix.gnu.org/63082>. * gnu/services/audio.scm (mpd-shepherd-service): Create a default .cache directory. Use mkdir-p/perms and refactor loop. Set the HOME environment variables.
parent
07bb69d52c
commit
776317e707
|
@ -34311,7 +34311,8 @@ The directory to store playlists.
|
|||
The directory to store playlists.
|
||||
|
||||
@item @code{db-file} (type: maybe-string)
|
||||
The location of the music database.
|
||||
The location of the music database. When left unspecified,
|
||||
@file{~/.cache/db} is used.
|
||||
|
||||
@item @code{state-file} (type: maybe-string)
|
||||
The location of the file that stores current MPD's state.
|
||||
|
|
|
@ -472,7 +472,8 @@ The available values, in decreasing order of verbosity, are: @code{verbose},
|
|||
|
||||
(db-file
|
||||
maybe-string
|
||||
"The location of the music database.")
|
||||
"The location of the music database. When left unspecified,
|
||||
@file{~/.cache/db} is used.")
|
||||
|
||||
(state-file
|
||||
maybe-string
|
||||
|
@ -616,14 +617,20 @@ appended to the configuration.")
|
|||
#~(begin
|
||||
(use-modules (gnu build activation))
|
||||
|
||||
(let ((user (getpw #$username)))
|
||||
(let ((home #$(user-account-home-directory user)))
|
||||
(let ((user (getpw #$username))
|
||||
(default-cache-dir (string-append home "/.cache")))
|
||||
|
||||
(define (init-directory directory)
|
||||
(unless (file-exists? directory)
|
||||
(mkdir-p/perms directory user #o755)))
|
||||
|
||||
;; Define a cache location that can be automatically used
|
||||
;; for the database file, in case it hasn't been explicitly
|
||||
;; specified.
|
||||
(for-each
|
||||
init-directory
|
||||
(cons default-cache-dir
|
||||
'#$(map dirname
|
||||
;; XXX: Delete the potential "syslog"
|
||||
;; log-file value, which is not a directory.
|
||||
|
@ -632,12 +639,16 @@ appended to the configuration.")
|
|||
(list db-file
|
||||
log-file
|
||||
state-file
|
||||
sticker-file))))))
|
||||
sticker-file)))))))
|
||||
|
||||
(make-forkexec-constructor
|
||||
(list #$(file-append package "/bin/mpd") "--no-daemon"
|
||||
#$config-file)
|
||||
#:environment-variables '#$environment-variables))))
|
||||
#:environment-variables
|
||||
;; Set HOME so MPD can infer default paths, such as
|
||||
;; for the database file.
|
||||
(cons (string-append "HOME=" home)
|
||||
'#$environment-variables))))))
|
||||
(stop #~(make-kill-destructor))
|
||||
(actions
|
||||
(list (shepherd-configuration-action config-file)
|
||||
|
|
Reference in New Issue