From 73aec83a3090eb9d2e3056884627bfd2333e3938 Mon Sep 17 00:00:00 2001
From: William Belle <william.belle@gmail.com>
Date: Thu, 23 Jan 2025 12:55:47 +0100
Subject: [PATCH] [fix] shell options with meteor install

Since grep returns an exit status of 1 when it doesn't find any match, it can
cause -e to terminate the script even when there wasn't a real "error".
---
 .github/workflows/test.yml | 5 ++++-
 Dockerfile                 | 2 +-
 Dockerfile-dev             | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2666e71..8f026ec 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -2,6 +2,9 @@ name: Test
 
 on: [push, pull_request]
 
+env:
+  METEOR_VERSION: 3.0-rc.4
+
 jobs:
   test:
     runs-on: ubuntu-latest
@@ -25,7 +28,7 @@ jobs:
 
       - name: Install meteor
         run: |
-          curl https://install.meteor.com | /bin/sh
+          curl https://install.meteor.com/?release=$METEOR_VERSION | sh
 
       - name: Test
         run: |
diff --git a/Dockerfile b/Dockerfile
index 7ae1866..9f1e7c5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,7 @@ FROM ubuntu:focal
 ENV METEOR_VERSION=3.0-rc.4
 
 RUN apt -qy update && apt -qy install curl build-essential python3 git
-RUN curl https://install.meteor.com/?release=$METEOR_VERSION | bash -e -x
+RUN curl https://install.meteor.com/?release=$METEOR_VERSION | sh
 
 COPY ./app /usr/src/app/
 WORKDIR /usr/src/app/
diff --git a/Dockerfile-dev b/Dockerfile-dev
index 53a4b7d..a7eb6bf 100644
--- a/Dockerfile-dev
+++ b/Dockerfile-dev
@@ -21,7 +21,7 @@ RUN apt-get -yqq update \
         make \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN curl https://install.meteor.com/?release=$METEOR_VERSION | bash -e -x
+RUN curl https://install.meteor.com/?release=$METEOR_VERSION | sh
 ENV PATH=$PATH:/root/.meteor
 
 WORKDIR /app