From dce2486d9ce7faba0b7b7455d01a996221189d29 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 12 May 2020 01:36:54 +0100
Subject: [PATCH] path

---
 g1sms/functions.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/g1sms/functions.sh b/g1sms/functions.sh
index 2f3f4b0..ed2352c 100755
--- a/g1sms/functions.sh
+++ b/g1sms/functions.sh
@@ -197,7 +197,7 @@ function sms_uid2key (){
 		echo "$DESTRIB" > "$RIBFILE"
 		echo "$ASKWALLET" > "$NAMEFILE"
 		log "__SUB:sms_uid2key: NEW EXTERNAL RELATED $DESTRIB / FOR MEMBER OR WALLET = $ASKWALLET - INIT 0.1 TX"
-        duniter_server=$(./tools/duniter_getnode.sh)
+        duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/tools/duniter_getnode.sh)
 		INIT=$(silkaj -p "$duniter_server" -af --file /home/$YOU/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output $DESTRIB --amount 1 --comment "[G1sms+] Porte Monnaie $(cat $UIDNAFILE) ->  $(cat $NAMEFILE)" -y)
 
 		log "__SUB:sms_uid2key: INIT = $INIT | Create Connection with related Wallet."
@@ -219,7 +219,7 @@ silkajQuantitativeAmountPattern='Total\sQuantitative\s+=\s+(.*)\s+Ğ1'
 silkajExitCode=1
 while [ $silkajExitCode -ne 0 ]
 do
-    duniter_server=$(./tools/duniter_getnode.sh)
+    duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/duniter_getnode.sh)
     silkajOutput=$(silkaj -p "${duniter_server}" balance $pubkey 2>/dev/null)
 	silkajExitCode=$?
     
@@ -297,7 +297,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
 		# ACTIVATE G1SMS WALLET
         #######################
 		# log "$NODE_PUBSECFILE $PUBKEY THIRD_PARTY_MANAGER:$NODE_G1PUBKEY"
-        duniter_server=$(./tools/duniter_getnode.sh)
+        duniter_server=$(/home/$YOU/.zen/astroport/zen/tools/duniter_getnode.sh)
         TX_IN=$(silkaj -p "$duniter_server" -af --file ~/.ssb/secret.dunikey tx --output $PUBKEY --amount 3.24 --comment "[G1sms+] $UIDNA$TAIL 3RD:$NODE_G1PUBKEY" -y)
 		log "__SUB:sms_INIT_ACCOUNT: G1 Wallet TX IN: $TX_IN"
 		sleep 2
@@ -310,7 +310,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
         ################
 		echo "$PIN" > "$PINFILE"
         echo "${IPFSPrivKey}" | gpg -q --output "$GPGPINFILE" --yes --pinentry-mode loopback --symmetric --passphrase-fd 0 "$PINFILE"
-        ./natools.py encrypt -p $NODE_G1PUBKEY -i "$PINFILE" -o "${PINFILE}.crypt"
+        /home/$YOU/.zen/astroport/zen/tools/natools.py encrypt -p $NODE_G1PUBKEY -i "$PINFILE" -o "${PINFILE}.crypt"
         PIN=$(cat "$PINFILE" | xargs)
         [[ "$PIN" != "" ]] && echo "" > "$PINFILE" || log "SYSTEM ERROR :: PIN EMPTY !!! GPG???"
         
@@ -333,7 +333,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
     # TODO make decypher less stress on filesystem, use /tmp and ramdisk
     echo "${IPFSPrivKey}" | gpg -d -q --output "$PINFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGPINFILE"
     PIN=$(cat "$PINFILE" | xargs)
-    [[ "$PIN" == "" ]] && [[ -f "${PINFILE}.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "${PINFILE}.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE");
+    [[ "$PIN" == "" ]] && [[ -f "${PINFILE}.crypt" ]] && /home/$YOU/.zen/astroport/zen/tools/natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "${PINFILE}.crypt" -o "$PINFILE" && PIN=$(cat "$PINFILE");
     [[ "$PIN" != "" ]] && echo "" > "$PINFILE" || log "SYSTEM ERROR :: PIN EMPTY !!! GPG???"
 
     # TODO  ./natools.py encrypt -p $NODE_G1PUBKEY -i "$DUNIKEYFILE" -o "$DUNIKEYFILE.crypt"
@@ -341,7 +341,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
     
     # EMAIL
     [[ $SMSEMAIL == "" ]] && [[ -f "$GPGMAILFILE" ]] && echo "${IPFSPrivKey}" | gpg -d -q --output "$MAILFILE" --yes --pinentry-mode loopback --passphrase-fd 0 "$GPGMAILFILE" && SMSEMAIL=$(cat $MAILFILE)
-    [[ $SMSEMAIL == "" ]] && [[ -f "$MAILFILE.crypt" ]] && ./natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.crypt" -o "$MAILFILE" && SMSEMAIL=$(cat $MAILFILE)
+    [[ $SMSEMAIL == "" ]] && [[ -f "$MAILFILE.crypt" ]] && /home/$YOU/.zen/astroport/zen/tools/natools.py decrypt --pubsec -k "$NODE_PUBSECFILE" -i "$MAILFILE.crypt" -o "$MAILFILE" && SMSEMAIL=$(cat $MAILFILE)
     log "__SUB:sms_INIT_ACCOUNT: Déchiffrage EMAIL $SMSEMAIL"
     # EMPTY CLEAR EMAIL FILE
     [[ $SMSEMAIL != ""  ]] && echo "" > "$MAILFILE"