chore: fix make with /bin/sh (#129)

daeuniverse · Jun 9, 2023 · 9c632aa · 9c632aa
1 parent 812dd83
commit 9c632aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,6 +11,7 @@ on:
       - "go.mod"
       - "go.sum"
       - ".github/workflows/build.yml"
+      - "Makefile"
   release:
     types: [ prereleased ]
   pull_request:

diff --git a/Makefile b/Makefile
@@ -46,9 +46,9 @@ dae: ebpf
 
 ## Begin Git Submodules
 .gitmodules.d.mk: .gitmodules
-	@set -e -o pipefail && \
-	submodules=( $$(grep '\[submodule "' .gitmodules | cut -d'"' -f2) ) && \
-	echo "submodule_paths=$${submodules[@]}" > $@
+	@set -e && \
+	submodules=$$(grep '\[submodule "' .gitmodules | cut -d'"' -f2 | tr '\n' ' ') && \
+	echo "submodule_paths=$${submodules}" > $@
 
 -include .gitmodules.d.mk
 
@@ -58,7 +58,7 @@ $(submodule_paths): .gitmodules.d.mk
 
 submodule submodules: $(submodule_paths)
 	@if [ -z "$(submodule_paths)" ]; then \
-		rm -f .gitmodules.mk; \
+		rm -f .gitmodules.d.mk; \
 		echo "Failed to generate submodules list. Please try again."; \
 		exit 1; \
 	fi