checkRPCwallet before related scripts

fixes: #36
openoms · May 9, 2021 · 562e349 · 562e349
1 parent 8ca1319
commit 562e349
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/scripts/menu.payjoin.sh b/scripts/menu.payjoin.sh
@@ -3,6 +3,8 @@
 source /home/joinmarket/joinin.conf
 source /home/joinmarket/_functions.sh
 
+checkRPCwallet
+
 function receivePayJoin() {
 
 # wallet

diff --git a/scripts/menu.quickstart.sh b/scripts/menu.quickstart.sh
@@ -5,6 +5,8 @@
 source /home/joinmarket/joinin.conf
 source /home/joinmarket/_functions.sh
 
+checkRPCwallet
+
 function cacheAndShowQR() {
   # cache wallet data
   walletData=$(mktemp -p /dev/shm/)
@@ -65,7 +67,6 @@ case $CHOICE in
   GEN)
     menu_GEN;;
   m0)
-    checkRPCwallet
     # wallet
     chooseWallet
     cacheAndShowQR

diff --git a/scripts/menu.send.sh b/scripts/menu.send.sh
@@ -3,6 +3,8 @@
 source /home/joinmarket/joinin.conf
 source /home/joinmarket/_functions.sh
 
+checkRPCwallet
+
 # wallet
 chooseWallet
 

diff --git a/scripts/menu.yg.sh b/scripts/menu.yg.sh
@@ -4,6 +4,8 @@
 source /home/joinmarket/_functions.sh
 source /home/joinmarket/joinin.conf
 
+checkRPCwallet
+
 # add default value to joinin config if needed
 if ! grep -Eq "^YGwallet=" $joininConfPath; then
   echo "YGwallet=nil" >> $joininConfPath