From 1490cbcdb1f55d3c1bfbae11583d07c23a9d046e Mon Sep 17 00:00:00 2001 From: Ian Denhardt Date: Sun, 5 Jul 2020 01:41:56 -0400 Subject: [PATCH 1/2] Makefile: fail immediately if find-meteor-dev-bundle.sh fails. Fixes #3360. --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 30152a6af5..516075fc99 100644 --- a/Makefile +++ b/Makefile @@ -35,7 +35,10 @@ EKAM=ekam # (as of Jan 2020), notably Debian Sid, Fedora 30 and Archlinux. We're not # entirely sure what changed, but this seems like a backwards incompatibility # in libstdc++. See also issue #3171. -METEOR_DEV_BUNDLE=$(shell ./find-meteor-dev-bundle.sh) +METEOR_DEV_BUNDLE:=$(shell ./find-meteor-dev-bundle.sh) +ifneq '$(.SHELLSTATUS)' '0' +$(error Failed to find meteor dev bundle; have you installed Meteor?) +endif METEOR_SPK_VERSION=0.5.1 METEOR_SPK=$(PWD)/meteor-spk-$(METEOR_SPK_VERSION)/meteor-spk NODEJS=$(METEOR_DEV_BUNDLE)/bin/node From b291bcf3d71d4bfdbb3233857af16959672eb0f1 Mon Sep 17 00:00:00 2001 From: Ian Denhardt Date: Sun, 5 Jul 2020 02:50:15 -0400 Subject: [PATCH 2/2] Also check for failures when looking for meteor 1.8.2 --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 516075fc99..1c5a1bdfac 100644 --- a/Makefile +++ b/Makefile @@ -294,7 +294,10 @@ tmp/.shell-env: tmp/.ekam-run $(IMAGES) shell/imports/client/changelog.html shel # a broken font file (all icons invisible and zero-width). For now we stick with the old version # and run it using Meteor 1.8.2's node which is old enough to run it. This means you have to # install Meteor 1.8.2 in addition to the latest version in order to build Sandstorm. :( -METEOR_DEV_BUNDLE_ICONS=$(shell ./find-meteor-dev-bundle.sh METEOR@1.8.2) +METEOR_DEV_BUNDLE_ICONS:=$(shell ./find-meteor-dev-bundle.sh METEOR@1.8.2) +ifneq '$(.SHELLSTATUS)' '0' +$(error Failed to find meteor dev bundle; have you installed Meteor?) +endif icons/node_modules: icons/package.json cd icons && PATH=$(METEOR_DEV_BUNDLE_ICONS)/bin:$$PATH $(METEOR_DEV_BUNDLE_ICONS)/bin/npm install