From 1bac240faea621561869df41da7b7f32ed65fa50 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Mon, 11 May 2020 03:40:27 +0200
Subject: [PATCH] swarm ID

---
 g1sms/init_keys.sh   | 19 ++++++++++---------
 g1sms/sms_DESTROY.sh |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/g1sms/init_keys.sh b/g1sms/init_keys.sh
index 8b97075..70b8475 100755
--- a/g1sms/init_keys.sh
+++ b/g1sms/init_keys.sh
@@ -9,6 +9,10 @@
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 
+YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
+IPFSNODEID=$(ipfs id -f='<id>\n')
+NANODATE=$(date -u +%s%N) #1569692075385428020
+
 ## IS IT A SMS NODE (gammu-smsd is installed)??
 if [[ $(which gammu-smsd) ]]; then
     [[ ! $MASTERPHONE ]] && echo "MISSING MASTERPHONE run from init.sh" && exit 1
@@ -20,9 +24,6 @@ fi
 NODE_G1PUBKEY=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
 [[ $NODE_G1PUBKEY == "" ]] && echo "ERROR NODE_G1PUBKEY empty !! Please INIT SSB LAYER..." && exit 1
 
-YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
-IPFSNODEID=$(ipfs id -f='<id>\n')
-NANODATE=$(date -u +%s%N) #1569692075385428020
 
 echo "
 $NANODATE
@@ -151,14 +152,15 @@ if [[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_nanodate ]]; then
 fi
 
 ################################################################
-#INFORM ABOUT NODE CAPACITIES
-export NODEPUB=$(cat "~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.pubkey")
+# PRINTER CAPACITIES ??
 
 ## IS THERE USB PRINTER CONNECTED?
 if [[ -e "/dev/usb/lp0" ]]; then
     log "G1CORE: IMPRESSION G1Tag ACTIF .............."
-    PRINT=true
-    # echo $ADRESSE > "~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where"
+    export PRINT=true
+    echo "$ADRESSE" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where
+else
+    rm -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where
 fi
 
 echo '
@@ -167,7 +169,6 @@ echo '
   \__ \| | /| / / /| | / /_/ / /|_/ /  / / __  / 
  ___/ /| |/ |/ / ___ |/ _, _/ /  / /  / / /_/ /  
 /____/ |__/|__/_/  |_/_/ |_/_/  /_/  /_/\__,_/   
-                                                
+                                                loaded
 '
 ls -a ~/.zen/ipfs/.$IPFSNODEID/G1SSB/
-cat ~/.zen/secret.astroport.key
diff --git a/g1sms/sms_DESTROY.sh b/g1sms/sms_DESTROY.sh
index 39289b7..e08c4eb 100755
--- a/g1sms/sms_DESTROY.sh
+++ b/g1sms/sms_DESTROY.sh
@@ -39,7 +39,7 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
     duniter_server=$(./tools/duniter_getnode.sh)
     PAY=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$MEMRIB" --amount "$GETLIMIT" --comment "[G1sms+] Wallet DESTROY $MEMBER $MEMBERUID" -y)
     sleep 5
-    back=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODEPUB" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
+    back=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
 
     # TODO DEBUG :: echo $PAY
     if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" && "$(echo $back | grep 'successful')" != "" ]]; then