From: W.C.A. Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 24 Jun 2021 19:16:20 +0000 (+0200)
Subject: Analysis workflow, remove SHELL setting because make mangles it.
X-Git-Tag: release-1.13.2rc1~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f963fc51d44d886e31c3a2763aea6d351160770f;p=thirdparty%2Funbound.git

Analysis workflow, remove SHELL setting because make mangles it.
---

diff --git a/.github/workflows/analysis_ports.yml b/.github/workflows/analysis_ports.yml
index 39c187cd2..a32344089 100644
--- a/.github/workflows/analysis_ports.yml
+++ b/.github/workflows/analysis_ports.yml
@@ -293,17 +293,17 @@ jobs:
           ./configure SHELL=/usr/bin/bash CONFIG_SHELL=/usr/bin/bash --prefix="$prepath/expat" --exec-prefix="$prepath/expat" --bindir="$prepath/expat/bin" --includedir="$prepath/expat/include" --mandir="$prepath/expat/man" --libdir="$prepath/expat/lib"
           # fixup shell from space in pathname
           mv Makefile Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < Makefile.orig > Makefile
+          sed -e 's?^SHELL =.*$??' < Makefile.orig > Makefile
           mv lib/Makefile lib/Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < lib/Makefile.orig > lib/Makefile
+          sed -e 's?^SHELL =.*$??' < lib/Makefile.orig > lib/Makefile
           mv doc/Makefile doc/Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < doc/Makefile.orig > doc/Makefile
+          sed -e 's?^SHELL =.*$??' < doc/Makefile.orig > doc/Makefile
           mv examples/Makefile examples/Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < examples/Makefile.orig > examples/Makefile
+          sed -e 's?^SHELL =.*$??' < examples/Makefile.orig > examples/Makefile
           mv tests/Makefile tests/Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < tests/Makefile.orig > tests/Makefile
+          sed -e 's?^SHELL =.*$??' < tests/Makefile.orig > tests/Makefile
           mv xmlwf/Makefile xmlwf/Makefile.orig
-          sed -e 's?C:/Program Files/Git/usr/bin/sh.exe?/usr/bin/sh?g' < xmlwf/Makefile.orig > xmlwf/Makefile
+          sed -e 's?^SHELL =.*$??' < xmlwf/Makefile.orig > xmlwf/Makefile
           echo "make"
           make
           echo "make install"