From a387d82e18c48e4909c7e9aecaf0d92240b0d65b Mon Sep 17 00:00:00 2001
From: openoms <oms@tuta.io>
Date: Wed, 18 Sep 2019 17:30:17 +0100
Subject: [PATCH] btcpay: use rm -f and fail if chmod 600 fails

---
 BTCPayServer/btcpay_to_blitz.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/BTCPayServer/btcpay_to_blitz.sh b/BTCPayServer/btcpay_to_blitz.sh
index 6e6265f..99b86fc 100644
--- a/BTCPayServer/btcpay_to_blitz.sh
+++ b/BTCPayServer/btcpay_to_blitz.sh
@@ -34,11 +34,11 @@ sudo certbot certonly --authenticator standalone -d $YOUR_DOMAIN --pre-hook "ser
 
 # cleanup possible residual files from previous installs
 
-sudo rm /home/admin/.nbxplorer/Main/settings.config
-sudo rm /etc/systemd/system/nbxplorer.service
-sudo rm /etc/systemd/system/btcpayserver.service
-sudo rm /home/admin/.btcpayserver/Main/settings.config
-sudo rm /etc/nginx/sites-available/btcpayserver
+sudo rm -f /home/admin/.nbxplorer/Main/settings.config
+sudo rm -f /etc/systemd/system/nbxplorer.service
+sudo rm -f /etc/systemd/system/btcpayserver.service
+sudo rm -f /home/admin/.btcpayserver/Main/settings.config
+sudo rm -f /etc/nginx/sites-available/btcpayserver
 
 #dotNET
 
@@ -105,12 +105,12 @@ echo "***"
 echo "getting RPC credentials from the bitcoin.conf"
 RPC_USER=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcuser | cut -c 9-)
 PASSWORD_B=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcpassword | cut -c 13-)
-
+chmod 600 /home/admin/.nbxplorer/Main/settings.config || exit 1
 cat >> /home/admin/.nbxplorer/Main/settings.config <<EOF
 btc.rpc.user=raspibolt
 btc.rpc.password=$PASSWORD_B
 EOF
-chmod 600 /home/admin/.nbxplorer/Main/settings.config
+
 
 sudo systemctl restart nbxplorer
 
@@ -170,7 +170,7 @@ sudo ufw allow 80
 sudo ufw allow 443
 
 # set nginx
-sudo rm /etc/nginx/sites-enabled/default
+sudo rm -f /etc/nginx/sites-enabled/default
 
 echo "
 server {