From 0d0943fd937f90b7a7b5d9bf842535e1ba6f1a70 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Sat, 13 Feb 2021 17:59:10 +0100
Subject: [PATCH] cleaning and export variable

---
 .install/update_bashrc.sh      | 8 ++++----
 ajouter_video.sh               | 6 +++---
 zen/ipfs_SWARM_refresh.sh      | 4 ----
 zen/refresh_ASTRXBIAN_index.sh | 9 ++-------
 4 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/.install/update_bashrc.sh b/.install/update_bashrc.sh
index 0dfac2872..854d3f0f4 100755
--- a/.install/update_bashrc.sh
+++ b/.install/update_bashrc.sh
@@ -28,11 +28,11 @@ if [[ $YOU != "" && $IPFSNODEID != "" && $G1PUB != "" ]]; then
 	fi
 else
 # CREATE
-	echo "PATH=$PATH:$HOME/.local/bin" >> ~/.bashrc
+	echo "export PATH=$PATH:$HOME/.local/bin" >> ~/.bashrc
 	echo "### ASTROPORT IDENTITY ###" >> ~/.bashrc
-	echo "YOU=$newYOU" >> ~/.bashrc
-	echo "G1PUB=$newG1PUB" >> ~/.bashrc
-	echo "IPFSNODEID=$newIPFSNODEID" >> ~/.bashrc
+	echo "export YOU=$newYOU" >> ~/.bashrc
+	echo "export G1PUB=$newG1PUB" >> ~/.bashrc
+	echo "export IPFSNODEID=$newIPFSNODEID" >> ~/.bashrc
 	echo "IPNSKEY=_IPNSKEY_" >> ~/.bashrc
 	[[ "$XZUID" != "" ]] && echo "XZUID=$XZUID" >> ~/.bashrc
 fi
diff --git a/ajouter_video.sh b/ajouter_video.sh
index bef8d1a6c..362636992 100755
--- a/ajouter_video.sh
+++ b/ajouter_video.sh
@@ -157,7 +157,7 @@ GENRES="[\"$(echo ${FILM_GENRES} | sed s/\|/\",\"/g)\"]"
 [[ $GENRES == "" ]] && exit 1
 
 # VIDEO GROUP
-# GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
+GROUPES=$(zenity --entry --width 300 --title "Groupe" --text "Associez la vidéo à un groupe (optionnel). Exemple: PIXAR" --entry-text="${XZUID}")
 
 # DEBUG VERIFICATION
 zenity --question --width ${large} --title "Vérifiez les informations: CAT; TMDB; YEAR; TITLE; SAISON; GENRES; GROUPES; RES"\
@@ -190,9 +190,9 @@ isLINKinMYINDEX=$(grep "$IPFSREPFILEID" ~/.zen/ipfs/.${IPFSNODEID}/astroport/kod
 
 # Is it a new file? Add it to INDEX
 if [[ ! $isFILEinINDEX && ! $isLINKinINDEX ]]; then
-	mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/$G1PUB/
+	mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/PIN/${IPFSREPFILEID}/${G1PUB}/
 	# SIMILAR with "ipfs ls /ipns/${IPFSNODEID}/.${IPFSNODEID}/PIN/ (...)"
-	echo "${CAT};$TMDB;$YEAR;\"$TITLE\";\"$SAISON\";${GENRES};${XZUID};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
+	echo "${CAT};$TMDB;$YEAR;$TITLE;$SAISON;${GENRES};${GROUPES};$RES;/ipfs/$IPFSREPFILEID/$URLENCODE_FILE_NAME" >> ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 else
 	if [[ $isFILEinMYINDEX ]]; then
 		echo "$FILE_NAME already in index" ## File was updated => Change OLDLINK
diff --git a/zen/ipfs_SWARM_refresh.sh b/zen/ipfs_SWARM_refresh.sh
index bd0246ae3..757d4327c 100755
--- a/zen/ipfs_SWARM_refresh.sh
+++ b/zen/ipfs_SWARM_refresh.sh
@@ -90,11 +90,7 @@ ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$IPFSNODEID
 ########################################################################
 # REFRESH xbian Film Serie Anime ASTRXBIAN index
 ########################################################################
-[[ -f ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid ]] && XZUID=$(cat ~/.zen/ipfs/.${IPFSNODEID}/_xbian.zuid)
-[[ ! $XZUID ]] && [[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title ]] && XZUID=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title) || XZUID=$(hostname)
-
 mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
-mv ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN # MOVE OLD FS
 
 PREFIX="F"
 cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}* | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
diff --git a/zen/refresh_ASTRXBIAN_index.sh b/zen/refresh_ASTRXBIAN_index.sh
index 5351d8e96..fbc95d0a7 100755
--- a/zen/refresh_ASTRXBIAN_index.sh
+++ b/zen/refresh_ASTRXBIAN_index.sh
@@ -6,19 +6,14 @@
 ########################################################################
 # REFRESH ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 ########################################################################
-
 export YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
-[[ $IPFSNODEID ]] && export IPFSNODEID=$IPFSNODEID || export IPFSNODEID=$(ipfs id -f='<id>\n')
+export IPFSNODEID=$(ipfs id -f='<id>\n')
 
-[[ -f ~/.zen/ipfs/.${IPFSNODEID}/G1SSB/_g1.gchange_title ]] && XZUID="$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title)" || XZUID="$(hostname)"
-
-rm -Rf ~/.zen/ipfs/astroport # Correct old bug ${IPFSNODEID} empty
-mkdir -p ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/
+[[ ! -d ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/ ]] && echo "Ajouter un Film avec ~/.zen/astrXbian/ajouter_video.sh " && exit 1
 
 # REFRESH INDEX Films Animes Series ...
 for PREFIX in F A S
 do
-    [[ -f ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ]] && mv ~/.zen/ipfs/xbian/${PREFIX}${XZUID} ~/.zen/ipfs/.${IPFSNODEID}/astroport/kodi/vstream/${PREFIX}ASTRXBIAN
 	cat ~/.zen/ipfs_swarm/.*/astroport/kodi/vstream/${PREFIX}ASTRXBIAN | sort | uniq > ~/.zen/ipfs/.${IPFSNODEID}/${PREFIX}ASTRXBIAN
 	echo "${PREFIX} INDEX UPDATED : http://127.0.0.1:8181/ipns/${IPFSNODEID}/.${IPFSNODEID}/${PREFIX}ASTRXBIAN"
 done