Simplify config options when running within myNode (#44)

Author: tehelsper

scripts/_functions.bitcoincore.sh

@@ -367,6 +367,9 @@ function connectLocalNode() {
   if [ $runningEnv = raspiblitz ];then
     rpc_user=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf | grep rpcuser | cut -c 9-)
     rpc_pass=$(sudo cat /mnt/hdd/bitcoin/bitcoin.conf|grep rpcpassword|cut -c 13-)
+  elif [ $runningEnv = mynode ];then
+    rpc_user=mynode
+    rpc_pass=$(sudo cat /mnt/hdd/mynode/settings/.btcrpcpw)
   elif [ $runningEnv = standalone ];then
     rpc_user=$(sudo cat /home/bitcoin/.bitcoin/bitcoin.conf|grep rpcuser|cut -c 9-)
     rpc_pass=$(sudo cat /home/bitcoin/.bitcoin/bitcoin.conf|grep rpcpassword|cut -c 13-)

scripts/menu.config.sh

@@ -6,6 +6,8 @@ source /home/joinmarket/_functions.sh
 if [ "${runningEnv}" = standalone ]; then
   source /home/joinmarket/standalone/_functions.standalone.sh
   network=mainnet
+elif [ "${runningEnv}" = mynode ];then
+  network=mainnet
 elif [ "${runningEnv}" = raspiblitz ];then
   source /mnt/hdd/raspiblitz.conf
   if [ $network = bitcoin ];then

scripts/menu.sh

@@ -28,9 +28,11 @@ OPTIONS+=(
   "" ""
   OFFERS  "Watch the Order Book locally"
   "" "" 
-  CONFIG  "Connection and joinmarket.cfg settings"
-  TOOLS   "Extra helper functions and services"
-  UPDATE  "Update JoininBox or JoinMarket")
+  CONFIG "Connection and joinmarket.cfg settings" \
+  TOOLS  "Extra helper functions and services")
+if [ "${runningEnv}" != mynode ]; then
+  OPTIONS+=(UPDATE "Update JoininBox or JoinMarket")
+fi
 
 CHOICE=$(dialog --clear \
                 --backtitle "$BACKTITLE" \

scripts/menu.tools.sh

@@ -51,9 +51,11 @@ fi
 OPTIONS+=(
     QR "Display a QR code from any text"
     CUSTOMRPC "Run a custom bitcoin RPC with curl"
-    BOLTZMANN "Analyze the entropy of a transaction"
-    PASSWORD "Change the ssh password"
-    LOGS "Show the bitcoind logs on $network")
+    BOLTZMANN "Analyze the entropy of a transaction")
+if [ "${runningEnv}" != mynode ]; then
+    OPTIONS+=(PASSWORD "Change the ssh password")
+fi
+OPTIONS+=(LOGS "Show the bitcoind logs on $network")
 
 CHOICE=$(dialog --clear \
                 --backtitle "$BACKTITLE" \

scripts/start.joininbox.sh

@@ -25,6 +25,8 @@ if [ "$setupStep" -lt 100 ];then
     if [ "$runningEnvEntry" -eq 0 ];then  
       if [ -f "/mnt/hdd/raspiblitz.conf" ];then
         runningEnv="raspiblitz"
+      elif [ -f "/usr/share/mynode/mynode_config.sh" ];then
+        runningEnv="mynode"
       else
         runningEnv="standalone"
       fi