From ea70e9fe3c7437b442a975b6066450e1564f092c Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 19 Sep 2021 21:41:32 +0200
Subject: [PATCH] youtube_watch_steps....  sed "s/\${IPFSNODEID}/$IPFSNODEID/g"

---
 zen/ipns_TAG_refresh.sh      |  1 +
 zen/new_file_in_astroport.sh | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/zen/ipns_TAG_refresh.sh b/zen/ipns_TAG_refresh.sh
index 6830a57..b9b83b0 100755
--- a/zen/ipns_TAG_refresh.sh
+++ b/zen/ipns_TAG_refresh.sh
@@ -104,6 +104,7 @@ do
     echo "=======> Mediakey Welcome index.html "
     cat /home/$YOU/.zen/astrXbian/www/boris/youtube_watch_step2.html \
         | sed "s/\${IPNSLINK}/$IPNSLINK/g" \
+        | sed "s/\${IPFSNODEID}/$IPFSNODEID/g" \
         | sed "s/\${XZUID}/$XZUID/g" \
         | sed "s/\${G1PUB}/$G1PUB/g" \
         | sed "s/\${TITLE}/$TITLE/g" \
diff --git a/zen/new_file_in_astroport.sh b/zen/new_file_in_astroport.sh
index 8929697..84d815b 100755
--- a/zen/new_file_in_astroport.sh
+++ b/zen/new_file_in_astroport.sh
@@ -300,6 +300,7 @@ IPNSLINK=$(ipfs key list -l | grep ${MEDIAKEY} | cut -d ' ' -f 1)
     echo "=======> Mediakey Welcome index.html "
     cat /home/$YOU/.zen/astrXbian/www/boris/youtube_watch_step2.html \
         | sed "s/\${IPNSLINK}/$IPNSLINK/g" \
+        | sed "s/\${IPFSNODEID}/$IPFSNODEID/g" \
         | sed "s/\${XZUID}/$XZUID/g" \
         | sed "s/\${G1PUB}/$G1PUB/g" \
         | sed "s/\${TITLE}/$TITLE/g" \
@@ -337,7 +338,9 @@ NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1
 echo $NEWIPFS > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.chain
 echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/.timestamp
 NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 )
+[ ! $? -eq 0 ] && echo "~~~ FAILURE ~~~ ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1" && exit 1
 IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
+[ ! $? -eq 0 ] && echo "~~~ FAILURE ~~~ ipfs name publish --quieter --key=${MEDIAKEY} $NEWIPFS" && exit 1
 ########################################################################
 ########################################################################
 
@@ -351,15 +354,18 @@ then
     ## CREATE GCHANGE AD
     if [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad && "${CAT}" != "youtube" ]]
     then
+
         GOFFER=$(~/.zen/astrXbian/zen/jaklis/jaklis.py -k ~/.zen/secret.dunikey -n "https://data.gchange.fr" setoffer -t "${TITLE} #astroport #${MEDIAKEY}" -d "${TITLE} https://tube.copylaradio.com/ipns/$IPNS/ Faites un don à son portefeuille pour le conserver dans le Mediacenter des Amis - https://CopyLaRadio.com - https://astroport.com" -p $HOME/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/QR.png)
         echo $GOFFER > ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad
         NEWIPFS=$(ipfs add -rHq ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/ | tail -n 1 )
         IPNS=$(ipfs name publish --quieter --key="${MEDIAKEY}" $NEWIPFS)
+
+        echo "Annonce gchange : $(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad)"
+
     fi
-    echo "Annonce gchange : $(cat ~/.zen/ipfs/.${IPFSNODEID}/KEY/${MEDIAKEY}/${G1PUB}/.gchange.ad)"
 
     ########################################################################
-    # ${PREFIX}ASTRXBIAN FILE : Add Header
+    # CREATION DU FICHIER ${PREFIX}ASTRXBIAN FILE : Add Header
     [[ ! -f ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN ]] \
     && echo "CAT;TMDB;YEAR;TITLE;SAISON;GENRES;GROUPES;RES;URLS=http://127.0.0.1:8181" > ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN