From fc38f746ee462bc4a20e6d8b2af4084ba7410f67 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Sun, 30 Sep 2018 20:28:23 +0900
Subject: [PATCH] rewrite build.sh to set default value to
 BTCPAYGEN_DOCKER_IMAGE

---
 build.ps1 | 3 ++-
 build.sh  | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.ps1 b/build.ps1
index 0303c5f..ec7f8fb 100755
--- a/build.ps1
+++ b/build.ps1
@@ -1,7 +1,8 @@
 # This script will run docker-compose-generator in a container to generate the yml files
 
 If (-not ($BTCPAYGEN_DOCKER_IMAGE)) { $BTCPAYGEN_DOCKER_IMAGE = "btcpayserver/docker-compose-generator" }
-If($BTCPAYGEN_DOCKER_IMAGE -eq "btcpayserver/docker-compose-generator:local"){
+
+If ($BTCPAYGEN_DOCKER_IMAGE -eq "btcpayserver/docker-compose-generator:local"){
 	docker build docker-compose-generator --tag $BTCPAYGEN_DOCKER_IMAGE
 } Else {
 	docker pull $BTCPAYGEN_DOCKER_IMAGE
diff --git a/build.sh b/build.sh
index b0d1b24..b3fab27 100755
--- a/build.sh
+++ b/build.sh
@@ -1,10 +1,11 @@
 #!/bin/bash
 
+: "${BTCPAYGEN_DOCKER_IMAGE:=btcpayserver/docker-compose-generator}"
 if [ "$BTCPAYGEN_DOCKER_IMAGE" == "btcpayserver/docker-compose-generator:local" ]
 then
     docker build docker-compose-generator --tag $BTCPAYGEN_DOCKER_IMAGE
 else
-    docker pull ${BTCPAYGEN_DOCKER_IMAGE:-"btcpayserver/docker-compose-generator"}
+    docker pull $BTCPAYGEN_DOCKER_IMAGE
 fi
 
 # This script will run docker-compose-generator in a container to generate the yml files
@@ -23,7 +24,7 @@ docker run -v "$(pwd)/Generated:/app/Generated" \
            -e "BTCPAYGEN_ADDITIONAL_FRAGMENTS=$BTCPAYGEN_ADDITIONAL_FRAGMENTS" \
            -e "BTCPAYGEN_LIGHTNING=$BTCPAYGEN_LIGHTNING" \
            -e "BTCPAYGEN_SUBNAME=$BTCPAYGEN_SUBNAME" \
-           --rm ${BTCPAYGEN_DOCKER_IMAGE:-"btcpayserver/docker-compose-generator"}
+           --rm $BTCPAYGEN_DOCKER_IMAGE
 
 if [ "$BTCPAYGEN_REVERSEPROXY" == "nginx" ]; then
     cp Production/nginx.tmpl Generated/nginx.tmpl