From 2a70bbd86351130cfee1f406f92d9e99f4615cc2 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sun, 22 Mar 2020 04:59:40 +0100
Subject: [PATCH] fix NODE_G1PUBKEY

---
 zen/ssb_INIT.sh | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh
index dff7be5..22f0d90 100755
--- a/zen/ssb_INIT.sh
+++ b/zen/ssb_INIT.sh
@@ -34,11 +34,9 @@ echo '
 # NODE ENVIRONEMENT DETECTION
 ##############################################
 IPFSNODEID=$(ipfs id -f='<id>\n')
-[[ ! -f ~/.ssb/secret.dunikey ]] && $MY_PATH/tools/secret2dunikey.sh
-NODE_G1PUBKEY=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
 # CREATE ~/.zen/ipfs/.$IPFSNODEID/G1SSB
 ##############################################
-[[ $IPFSNODEID == "" ]] && echo "ERROR missing IPFSNODEID NODE_G1PUBKEY" && exit 1
+[[ $IPFSNODEID == "" ]] && echo "ERROR missing IPFSNODEID" && exit 1
 mkdir -p ~/.zen/ipfs/.$IPFSNODEID/G1SSB
 
 ssbpub=$(sbotc whoami 2>/dev/null | jq -r .id)
@@ -47,7 +45,7 @@ if [[ $ssbpub == "" ]]; then
 
 EXTERNAL=$(cat /etc/hostname).local
 mkdir -p ~/.ssb
-echo"
+echo "
          _      __ __ _  
  _ _ .__|_o _  (_ (_ |_) 
 (_(_)| || |(_| __)__)|_) 
@@ -77,12 +75,12 @@ cat > ~/.ssb/config <<EOF
   }
 }
 EOF
-echo "
+echo '
  __ _ _      _ _           
 (_ |_|_)\  /|_|_) o._ o_|_ 
 __)|_| \ \/ |_| \ || || |_ 
                            
-"
+'
 cat > ~/.zen/run-ssb-PUB_$EXTERNAL.sh <<EOF
 #!/bin/bash
 while true; do
@@ -99,6 +97,10 @@ ssbpub=$(sbotc whoami 2>/dev/null | jq -r .id)
 
 fi
 
+# secret.dunikey ? NODE_G1PUBKEY
+[[ ! -f ~/.ssb/secret.dunikey ]] && $MY_PATH/tools/secret2dunikey.sh
+NODE_G1PUBKEY=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
+
 echo "
 $ssbpub
          _____    _____ _