me
/
guix
Archived
1
0
Fork 0
Code

repl: Look for script files in (getcwd). 

Fixes <https://bugs.gnu.org/43331>.

* guix/scripts/repl.scm (guix-repl): Replace "." by (getcwd)
* tests/guix-repl.sh: Add test.

Co-authored-by: Ludovic Courtès <ludo@gnu.org>
master
Konrad Hinsen 2020-09-11 13:13:26 +02:00 committed by Ludovic Courtès
parent 7194b63833
commit d7f7ed39be
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
guix/scripts/repl.scm
View File

@ -178,7 +178,10 @@ call THUNK."
(lambda () (lambda ()
(set-program-arguments script) (set-program-arguments script)
(set-user-module) (set-user-module)
(load-in-vicinity "." (car script)))))
;; When passed a relative file name, 'load-in-vicinity' searches the
;; file in %LOAD-PATH. Thus, pass (getcwd) instead of ".".
(load-in-vicinity (getcwd) (car script)))))
(when (null? script) (when (null? script)
;; Start REPL ;; Start REPL

4
tests/guix-repl.sh
View File

@ -45,6 +45,10 @@ EOF
test "`guix repl "$tmpfile"`" = "coreutils" test "`guix repl "$tmpfile"`" = "coreutils"
# Make sure that the file can also be loaded when passed as a relative file
# name.
(cd "$(dirname "$tmpfile")"; test "$(guix repl "$(basename "$tmpfile")")" = "coreutils")
cat > "$module_dir/foo.scm"<<EOF cat > "$module_dir/foo.scm"<<EOF
(define-module (foo) (define-module (foo)