Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-19 13:49:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removing trailing space from process output for default install paths.

Browse source
This commit is contained in:
Alex Shinn 2015-05-09 16:17:28 +09:00
parent c8efdd0b58
commit 99b4a9aa83
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/chibi/snow/commands.scm
View file

@ -1242,14 +1242,18 @@
(cons share-dir (delete share-dir dirs)) (cons share-dir (delete share-dir dirs))
dirs))) dirs)))
((chicken) ((chicken)
(let ((dir (process->string '(csi -p "(repository-path)")))) (let ((dir (string-trim
(process->string '(csi -p "(repository-path)"))
char-whitespace?)))
(list (list
(if (file-exists? dir) ; repository-path should always exist (if (file-exists? dir) ; repository-path should always exist
dir dir
(make-path (or (conf-get cfg 'install-prefix)) "lib" impl 7))))) (make-path (or (conf-get cfg 'install-prefix)) "lib" impl 7)))))
((gauche) ((gauche)
(list (list
(let ((dir (process->string '(gauche-config "--sitelibdir")))) (let ((dir (string-trim
(process->string '(gauche-config "--sitelibdir"))
char-whitespace?)))
(or (and (string? dir) (> (string-length dir) 0) (or (and (string? dir) (> (string-length dir) 0)
(eqv? #\/ (string-ref dir 0)) (eqv? #\/ (string-ref dir 0))
dir) dir)
@ -1267,9 +1271,11 @@
((larceny) ((larceny)
(list (list
(make-path (make-path
(string-trim
(process->string (process->string
'(larceny -quiet -nobanner -- -e '(larceny -quiet -nobanner -- -e
"(begin (display (getenv \"LARCENY_ROOT\")) (exit))")) "(begin (display (getenv \"LARCENY_ROOT\")) (exit))"))
char-whitespace?)
"lib/Snow"))) "lib/Snow")))
(else (else
(list (make-path (or (conf-get cfg 'install-prefix) "/usr/local") (list (make-path (or (conf-get cfg 'install-prefix) "/usr/local")