me
/
guix
Archived
1
0
Fork 0
Code

home: symlink-manager: Use 'file-is-directory?'. 

* gnu/home/services/symlink-manager.scm (update-symlinks-script)[directory?]:
Remove.
Change callers to use 'file-is-directory?' instead.
master
Ludovic Courtès 2022-02-18 17:02:46 +01:00
parent cf803b71c7
commit e1b38046a6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 5 deletions
gnu/home/services

7
gnu/home/services/symlink-manager.scm
View File

@ -101,9 +101,6 @@ appear only after all nested items already listed."
(define (get-backup-path path)
(string-append backup-dir "/." path))
(define (directory? path)
(equal? (stat:type (stat path)) 'directory))
(define (empty-directory? dir)
(equal? (scandir dir) '("." "..")))
@ -133,7 +130,7 @@ appear only after all nested items already listed."
(('dir . path)
(if (and
(file-exists? (get-target-path path))
(directory? (get-target-path path))
(file-is-directory? (get-target-path path))
(empty-directory? (get-target-path path)))
(begin
(format #t (G_ "Removing ~a...")
@ -179,7 +176,7 @@ appear only after all nested items already listed."
(('dir . path)
(let ((target-path (get-target-path path)))
(when (and (file-exists? target-path)
(not (directory? target-path)))
(not (file-is-directory? target-path)))
(backup-file path))
(if (file-exists? target-path)