From f2b8d4a9da5a9df0aef0e9da71a62fd9d285e994 Mon Sep 17 00:00:00 2001 From: David Thompson Date: Sun, 28 Aug 2022 21:21:09 -0400 Subject: [PATCH] shell: Look for manifest.scm/guix.scm in non-interactive case, too. Fixes . Fixes a bug where a command like 'guix shell -- make' does not look for guix.scm or manifest like 'guix shell' with no additional arguments does. * guix/scripts/shell.scm (auto-detect-manifest): Remove check for non-interactive invocation that was stopping implicit loading. --- guix/scripts/shell.scm | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/guix/scripts/shell.scm b/guix/scripts/shell.scm index c115a00320..0e9ab0dd94 100644 --- a/guix/scripts/shell.scm +++ b/guix/scripts/shell.scm @@ -260,14 +260,10 @@ (define (options-contain-payload? opts) ((('expression . _) . _) #t) ((_ . rest) (options-contain-payload? rest)))) - (define interactive? - (not (assoc-ref opts 'exec))) - (define disallow-implicit-load? (assoc-ref opts 'explicit-loading?)) - (if (or (not interactive?) - disallow-implicit-load? + (if (or disallow-implicit-load? (options-contain-payload? opts)) opts (match (find-file-in-parent-directories '("manifest.scm" "guix.scm")) -- 2.37.2