From 7fccc106f8d4c2d19bcf7c95fb99b67d6a18a333 Mon Sep 17 00:00:00 2001
From: leo <leonardjonathanoh@live.com>
Date: Thu, 9 Mar 2023 12:22:41 +0000
Subject: [PATCH] Feature (ci): Add `./build.sh --env-file` param to build from
 an `.env` file (#125)

This makes it easier to run builds against a custom `.env` file.

Co-authored-by: leo <leonardjonathanoh@live.com>
Co-authored-by: joe <joeltimothyoh@live.com>
---
 .github/workflows/ci-master-pr.yml | 16 ++++------------
 build.sh                           | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml
index 59f2a7b2..81f1348f 100644
--- a/.github/workflows/ci-master-pr.yml
+++ b/.github/workflows/ci-master-pr.yml
@@ -18,17 +18,13 @@ jobs:
     - uses: actions/checkout@v3
     - name: Test build
       run: |
-        set -a
-        . ./test/build-hlds-cstrike.env
-        ./build.sh
+        ./build.sh --env-file ./test/build-hlds-cstrike.env
       env:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
     - name: Test update
       run: |
-        set -a
-        . ./test/update-hlds-cstrike.env
-        ./build.sh
+        ./build.sh --env-file ./test/update-hlds-cstrike.env
       env:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
@@ -39,17 +35,13 @@ jobs:
     - uses: actions/checkout@v3
     - name: Test build
       run: |
-        set -a
-        . ./test/build-srcds-hl2mp.env
-        ./build.sh
+        ./build.sh --env-file ./test/build-srcds-hl2mp.env
       env:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
     - name: Test update
       run: |
-        set -a
-        . ./test/update-srcds-hl2mp.env
-        ./build.sh
+        ./build.sh --env-file ./test/update-srcds-hl2mp.env
       env:
         STEAM_USERNAME: ${{ secrets.STEAM_USERNAME }}
         STEAM_PASSWORD: ${{ secrets.STEAM_PASSWORD }}
diff --git a/build.sh b/build.sh
index bafa48d6..3388ba40 100755
--- a/build.sh
+++ b/build.sh
@@ -42,6 +42,24 @@
 
 #############################  End of CI variables  ##############################
 
+# Get some options
+while test $# -gt 0; do
+    case "$1" in
+        -f|--env-file)
+            shift
+            ENV_FILE=$1
+            shift
+            ;;
+    esac
+done
+
+ENV_FILE=${ENV_FILE:-.env}
+if [ -f "$ENV_FILE" ]; then
+    ENV_FILE="$( cd "$( dirname "$ENV_FILE" )" && pwd )/$( basename "$ENV_FILE" )"
+    echo "Reading env file $ENV_FILE"
+    . "$ENV_FILE"
+fi
+
 # Process user variables
 REGISTRY_USER=${REGISTRY_USER:?err}
 REGISTRY_PASSWORD=${REGISTRY_PASSWORD:?err}