From 8f47e6dc97e4e04e99fbfaf1c6ea0d16ad8515d3 Mon Sep 17 00:00:00 2001 From: Dan Buch Date: Mon, 23 May 2022 07:44:58 -0400 Subject: [PATCH] Set absolute `bash` path and slightly revert assertion in docs test to ensure flag ordering --- docs/v2/manual.md | 2 +- internal/build/build.go | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/docs/v2/manual.md b/docs/v2/manual.md index 9ea6d53a9f..7208ae697f 100644 --- a/docs/v2/manual.md +++ b/docs/v2/manual.md @@ -363,7 +363,7 @@ For example this: ``` go package main diff --git a/internal/build/build.go b/internal/build/build.go index ab4547e993..d94dae7925 100644 --- a/internal/build/build.go +++ b/internal/build/build.go @@ -182,6 +182,13 @@ func testCleanup(packages []string) error { func GfmrunActionFunc(cCtx *cli.Context) error { top := cCtx.Path("top") + bash, err := exec.LookPath("bash") + if err != nil { + return err + } + + os.Setenv("SHELL", bash) + tmpDir, err := os.MkdirTemp("", "urfave-cli*") if err != nil { return err @@ -203,7 +210,6 @@ func GfmrunActionFunc(cCtx *cli.Context) error { } os.Setenv("TMPDIR", tmpDir) - os.Setenv("SHELL", "bash") if err := os.Chdir(wd); err != nil { return err