TakeV
/
guix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

home: import: Clarify alias parsing code. 

* guix/scripts/home/import.scm (generate-bash-configuration+modules)
[bash-alias->pair]: Return #f on match failure.
[parse-aliases]: Adjust accordingly and use 'match'.
Remove 'filter' call.
This commit is contained in:
Ludovic Courtès 2022-03-20 18:59:47 +01:00
parent 6da2a5a565
commit 3748c32b13
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
guix/scripts/home/import.scm
View File

@ -65,17 +65,19 @@ FILE-NAME with \"-\", and return the basename of it."
(define (bash-alias->pair line)
(match (regexp-exec alias-rx line)
(#f '())
(#f #f)
(matched
`(,(match:substring matched 1) . ,(match:substring matched 2)))))
(define (parse-aliases input)
(let loop ((line (read-line input))
(result '()))
(if (eof-object? line)
(reverse result)
(loop (read-line input)
(cons (bash-alias->pair line) result)))))
(let loop ((result '()))
(match (read-line input)
((? eof-object?)
(reverse result))
(line
(match (bash-alias->pair line)
(#f (loop result))
(alias (loop (cons alias result))))))))
(let ((rc (destination-append ".bashrc"))
(profile (destination-append ".bash_profile"))
@ -85,9 +87,9 @@ FILE-NAME with \"-\", and return the basename of it."
,@(if (file-exists? rc)
`((aliases
',(let* ((port (open-pipe* OPEN_READ "bash" "-i" "-c" "alias"))
(alist (parse-aliases port)))
(alist (parse-aliases port)))
(close-port port)
(filter (negate null?) alist))))
alist)))
'())
,@(if (file-exists? rc)
`((bashrc