From f3ed276b8e977a7604536e7a70443b1a0b713dc9 Mon Sep 17 00:00:00 2001
From: frennkie <mail@rhab.de>
Date: Tue, 26 May 2020 20:55:02 +0100
Subject: [PATCH] Resolve merge conflict

---
 home.admin/config.scripts/bonus.btc-rpc-explorer.sh      | 1 -
 home.admin/config.scripts/bonus.cryptoadvance-specter.sh | 1 -
 home.admin/config.scripts/bonus.rtl.sh                   | 1 -
 home.admin/config.scripts/internet.hiddenservice.sh      | 1 -
 home.admin/config.scripts/lnd.setport.sh                 | 1 -
 5 files changed, 5 deletions(-)

diff --git a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
index 292c8af33..6ada71c05 100644
--- a/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
+++ b/home.admin/config.scripts/bonus.btc-rpc-explorer.sh
@@ -157,7 +157,6 @@ EOF
     # open firewall
     echo "*** Updating Firewall ***"
     sudo ufw allow 3002 comment 'btc-rpc-explorer'
-    sudo ufw --force enable
     echo ""
 
     # install service
diff --git a/home.admin/config.scripts/bonus.cryptoadvance-specter.sh b/home.admin/config.scripts/bonus.cryptoadvance-specter.sh
index 990a35dbb..d4e5b5cce 100755
--- a/home.admin/config.scripts/bonus.cryptoadvance-specter.sh
+++ b/home.admin/config.scripts/bonus.cryptoadvance-specter.sh
@@ -125,7 +125,6 @@ EOF
     # open firewall
     echo "*** Updating Firewall ***"
     sudo ufw allow 25441 comment 'cryptoadvance-specter'
-    sudo ufw --force enable
     echo ""
 
     echo "*** Installing udev-rules for hardware-wallets ***"
diff --git a/home.admin/config.scripts/bonus.rtl.sh b/home.admin/config.scripts/bonus.rtl.sh
index 88dedf8b5..1b4d0e012 100755
--- a/home.admin/config.scripts/bonus.rtl.sh
+++ b/home.admin/config.scripts/bonus.rtl.sh
@@ -173,7 +173,6 @@ EOF
     # open firewall
     echo "*** Updating Firewall ***"
     sudo ufw allow 3000 comment 'RTL'
-    sudo ufw --force enable
     echo ""
 
     # install service
diff --git a/home.admin/config.scripts/internet.hiddenservice.sh b/home.admin/config.scripts/internet.hiddenservice.sh
index 7466fca95..2144a00ae 100644
--- a/home.admin/config.scripts/internet.hiddenservice.sh
+++ b/home.admin/config.scripts/internet.hiddenservice.sh
@@ -91,7 +91,6 @@ HiddenServicePort $toPort 127.0.0.1:$fromPort" | sudo tee -a /etc/tor/torrc
   echo "$TOR_ADDRESS"
   echo "use with the port: $toPort"
   echo ""
-  alreadyThere=$(sudo cat /etc/tor/torrc 2>/dev/null | grep -c "\b127.0.0.1:$fromPort2\b")
   if [ ${#toPort2} -gt 0 ]; then
     if [ ${alreadyThere} -eq 0 ]; then
       echo "or the port: $toPort2"
diff --git a/home.admin/config.scripts/lnd.setport.sh b/home.admin/config.scripts/lnd.setport.sh
index e855c82e2..2cb40cdff 100644
--- a/home.admin/config.scripts/lnd.setport.sh
+++ b/home.admin/config.scripts/lnd.setport.sh
@@ -79,6 +79,5 @@ sudo systemctl enable lnd
 
 # make sure port is open on firewall
 sudo ufw allow ${portnumber} comment 'LND Port'
-sudo ufw --force enable
 
 echo "needs reboot to activate new setting -> sudo shutdown -r now"
\ No newline at end of file