From 9a86ef2de80accfc9f3590b07d229b7889f4885c Mon Sep 17 00:00:00 2001 From: Stefano D'Angelo Date: Thu, 5 Jun 2025 08:21:03 +0200 Subject: [PATCH] use shell pipefail in makefiles --- templates/android-make/Makefile | 2 ++ templates/cmd-make/Makefile | 2 ++ templates/daisy-seed-make/Makefile | 2 ++ templates/ios-make/Makefile | 2 ++ templates/ios/tibia-index.js | 2 +- templates/lv2-make/Makefile | 2 ++ templates/web-demo/rules-extra-web-demo.mk | 2 +- templates/web-make/Makefile | 2 ++ 8 files changed, 14 insertions(+), 2 deletions(-) diff --git a/templates/android-make/Makefile b/templates/android-make/Makefile index 9674e25..99144f1 100644 --- a/templates/android-make/Makefile +++ b/templates/android-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := android include vars.mk diff --git a/templates/cmd-make/Makefile b/templates/cmd-make/Makefile index 26f4e19..bb4d9d3 100644 --- a/templates/cmd-make/Makefile +++ b/templates/cmd-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := cmd include vars.mk diff --git a/templates/daisy-seed-make/Makefile b/templates/daisy-seed-make/Makefile index f54f0d8..41a6e18 100644 --- a/templates/daisy-seed-make/Makefile +++ b/templates/daisy-seed-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := daisy-seed include vars.mk diff --git a/templates/ios-make/Makefile b/templates/ios-make/Makefile index 9536ddc..61459f5 100644 --- a/templates/ios-make/Makefile +++ b/templates/ios-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := ios include vars.mk diff --git a/templates/ios/tibia-index.js b/templates/ios/tibia-index.js index f7f4c64..8280ce6 100644 --- a/templates/ios/tibia-index.js +++ b/templates/ios/tibia-index.js @@ -26,5 +26,5 @@ module.exports = function (data, api) { api.generateFileFromTemplateFile(`src${sep}index.html`, `src${sep}index.html`, data); api.copyFile(`src${sep}native.mm`, `src${sep}native.mm`); api.copyFile(`src${sep}app-Bridging-Header.h`, `src${sep}app-Bridging-Header.h`); - api.copyFile(`src${sep}app.swift`, `src${sep}app.swift`, data); + api.copyFile(`src${sep}app.swift`, `src${sep}app.swift`); }; diff --git a/templates/lv2-make/Makefile b/templates/lv2-make/Makefile index 872cbac..e4e73e9 100644 --- a/templates/lv2-make/Makefile +++ b/templates/lv2-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := lv2 include vars.mk diff --git a/templates/web-demo/rules-extra-web-demo.mk b/templates/web-demo/rules-extra-web-demo.mk index 1950e93..97670c0 100644 --- a/templates/web-demo/rules-extra-web-demo.mk +++ b/templates/web-demo/rules-extra-web-demo.mk @@ -24,7 +24,7 @@ build/web/index.html: $(DATA_DIR)/src/index.html | build/web build/web/key.pem: build/web/cert.pem build/web/cert.pem: | build - yes "" | openssl req -x509 -newkey rsa:2048 -keyout build/web/key.pem -out build/web/cert.pem -days 365 -nodes 2>/dev/null + openssl req -x509 -newkey rsa:2048 -keyout build/web/key.pem -out build/web/cert.pem -days 365 -nodes -subj "/C=US/ST=Denial/L=Springfield/O=Dis/CN=www.example.com" 2>/dev/null strip-web-demo: build/web/index.html $(eval TMP := $(shell mktemp /tmp/index.XXXXXX)) diff --git a/templates/web-make/Makefile b/templates/web-make/Makefile index 66526f3..4d1d957 100644 --- a/templates/web-make/Makefile +++ b/templates/web-make/Makefile @@ -18,6 +18,8 @@ # File author: Stefano D'Angelo # +SHELL := bash -o pipefail + TEMPLATE := web include vars.mk