From 2ff40493cc8143ebe4af787b9233f5980aa7ab71 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Tue, 19 Jun 2018 01:52:45 +0900
Subject: [PATCH] Fix bug: Impossible to change some settings

---
 btcpay-setup.sh | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/btcpay-setup.sh b/btcpay-setup.sh
index bb2a275..f3fc5e9 100755
--- a/btcpay-setup.sh
+++ b/btcpay-setup.sh
@@ -215,10 +215,20 @@ fi
 " > /etc/profile.d/btcpay-env.sh
 chmod +x /etc/profile.d/btcpay-env.sh
 
-. /etc/profile.d/btcpay-env.sh
-
 echo -e "BTCPay Server environment variables successfully saved in /etc/profile.d/btcpay-env.sh\n"
 
+# Set .env file
+touch $BTCPAY_ENV_FILE
+echo "
+BTCPAY_HOST=$BTCPAY_HOST
+ACME_CA_URI=$ACME_CA_URI
+NBITCOIN_NETWORK=$NBITCOIN_NETWORK
+LETSENCRYPT_EMAIL=$LETSENCRYPT_EMAIL
+LIGHTNING_ALIAS=$LIGHTNING_ALIAS" > $BTCPAY_ENV_FILE
+echo -e "BTCPay Server docker-compose parameters saved in $BTCPAY_ENV_FILE\n"
+
+. /etc/profile.d/btcpay-env.sh
+
 if ! [ -x "$(command -v docker)" ] || ! [ -x "$(command -v docker-compose)" ]; then
     apt-get update 2>error
     apt-get install -y \
@@ -256,16 +266,6 @@ else
     echo -e "docker-compose is already installed\n"
 fi
 
-# Set .env file
-touch $BTCPAY_ENV_FILE
-echo "
-BTCPAY_HOST=$BTCPAY_HOST
-ACME_CA_URI=$ACME_CA_URI
-NBITCOIN_NETWORK=$NBITCOIN_NETWORK
-LETSENCRYPT_EMAIL=$LETSENCRYPT_EMAIL
-LIGHTNING_ALIAS=$LIGHTNING_ALIAS" > $BTCPAY_ENV_FILE
-echo -e "BTCPay Server docker-compose parameters saved in $BTCPAY_ENV_FILE\n"
-
 # Generate the docker compose in BTCPAY_DOCKER_COMPOSE
 . ./build.sh