]> git.ipfire.org Git - thirdparty/unbound.git/commitdiff
Analysis workflow, fixup shell.
authorW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 24 Jun 2021 18:51:45 +0000 (20:51 +0200)
committerW.C.A. Wijngaards <wouter@nlnetlabs.nl>
Thu, 24 Jun 2021 18:51:45 +0000 (20:51 +0200)
.github/workflows/analysis_ports.yml

index 4e109d58cc53c17c0e1366d324610650a543c9ea..9dc4cc47d4d133eb58cb73df35a8301a7ff432e1 100644 (file)
@@ -289,15 +289,11 @@ jobs:
           curl -L -k -s -S -o expat-2.2.10.tar.gz https://github.com/libexpat/libexpat/releases/download/R_2_2_10/expat-2.2.10.tar.gz
           tar xzf expat-2.2.10.tar.gz
           cd expat-2.2.10
-          echo "SHELL=${SHELL}"
-          ls /bin/sh || echo whatever
-          ls /usr/bin/sh || echo whatever
-          export CONFIG_SHELL=/usr/bin/sh
-          echo "CONFIG_SHELL=${CONFIG_SHELL}"
-          export SHELL=/usr/bin/sh
-          echo "SHELL=${SHELL}"
-          echo "./configure --prefix=\"$prepath/expat\" --exec-prefix=\"$prepath/expat\" --bindir=\"$prepath/expat/bin\" --includedir=\"$prepath/expat/include\" --mandir=\"$prepath/expat/man\" --libdir=\"$prepath/expat/lib\""
-          ./configure --prefix="$prepath/expat" --exec-prefix="$prepath/expat" --bindir="$prepath/expat/bin" --includedir="$prepath/expat/include" --mandir="$prepath/expat/man" --libdir="$prepath/expat/lib"
+          echo "./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\""
+          ./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"
+          mv Makefile Makefile.orig
+          # fixup shell from space in pathname
+          sed -e 's?^SHELL=.*$?SHELL=/usr/bin/sh?' < Makefile.orig > Makefile
           echo "make"
           make
           echo "make install"