From 5a9bea094cf67bd3b41b0a7ad5082cd0c3b53d93 Mon Sep 17 00:00:00 2001 From: qo-op Date: Mon, 5 Apr 2021 01:14:11 +0200 Subject: [PATCH] do/done control corrections --- zen/wordpress_channel.sh | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/zen/wordpress_channel.sh b/zen/wordpress_channel.sh index b2b1c3f..f13e665 100755 --- a/zen/wordpress_channel.sh +++ b/zen/wordpress_channel.sh @@ -18,15 +18,17 @@ IPFSNODEID=$(ipfs id -f='\n') ## CREATION DE LA ZONE DE DIALOGUE IPFS SWARM for wpcall in $(ls -d ~/.zen/ipfs_swarm/.12D*/astroport/wordpress/*); do - ls $wpcall - [[ -f $wpcall/do ]] && istodo=$(cat $wpcall/do) - [[ -f $wpcall/done ]] && isdone=$(cat $wpcall/done) - [[ ! $isdone && ! $istodo ]] && continue - + echo "$wpcall" && ls $wpcall ipfnodesource=$(echo "$wpcall" | cut -d '/' -f 6 | cut -d '.' -f 2 ) g1pubsource=$($MY_PATH/tools/ipfs_to_g1.py $ipfnodesource) mediakey=$(echo "$wpcall" | cut -d '/' -f 9 ) - + ## REFRESH SWARM cache + $MY_PATH/tools/timeout.sh -t 12 ipfs get --output=/home/$YOU/.zen/ipfs_swarm/ /ipns/$ipfnodesource + + [[ -f $wpcall/do ]] && istodo=$(cat $wpcall/do) + [[ -f $wpcall/done ]] && isdone=$(cat $wpcall/done) + [[ ! $isdone && ! $istodo ]] && continue + if [[ "$ipfsnodeid" != "$IPFSNODEID" ]]; then [[ ! $(which wp) ]] && continue # MUST RUN WORDPRESS and wp-cli @@ -43,7 +45,7 @@ do xzuid=$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/_xbian.zuid) mynodename=$(cat ~/.zen/ipfs_swarm/.$IPFSNODEID/G1SSB/_nodename) - genres="$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/ajouter_video.txt | cut -d ';' -f 6 | sed 's/\|/,/g' | awk '{print tolower($0)}' )" + genres="$(cat ~/.zen/ipfs_swarm/.$ipfnodesource/KEY/$mediakey/$g1pubsource/ajouter_video.txt | cut -d ';' -f 6 | sed 's/\|/,/g')" # 1=DIY, Habiter=2, Guerir=3, Divertir=4, Déplacer=5, Energie=6, Cultiver=7 cd /var/www/wordpress/