diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh index ae586d6a..d73b1ae8 100755 --- a/ASTROBOT/G1CopierYoutube.sh +++ b/ASTROBOT/G1CopierYoutube.sh @@ -98,7 +98,8 @@ while read LINE; echo "--- CACHE SEARCH FOR $YID ---" && TIDDLER=$(ls -t "$HOME/.zen/game/players/"*"/G1CopierYoutube/$YID.TW.json" 2>/dev/null | head -n 1) [[ ! $TIDDLER ]] && TIDDLER=$(ls -t "$HOME/.zen/tmp/$IPFSNODEID/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1) [[ ! $TIDDLER ]] && TIDDLER=$(ls -t "$HOME/.zen/tmp/swarm/"*"/G1CopierYoutube/"*"/$YID.TW.json" 2>/dev/null | head -n 1) - [[ $TIDDLER ]] && echo "Tiddler Found in CACHE : $TIDDLER" || echo "EMPTY." + [[ $TIDDLER ]] && echo "Tiddler Found in CACHE : $TIDDLER" \ + || echo "EMPTY." ################################################################### if [[ ! ${TIDDLER} ]]; then diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh index dd2ac6c8..b9437f45 100755 --- a/tools/Connect_PLAYER_To_Gchange.sh +++ b/tools/Connect_PLAYER_To_Gchange.sh @@ -207,13 +207,14 @@ do echo "TW ? $LIBRA/ipns/$FRIENDNS " ##### CHECKING IF WE LIKE EACH OTHER Ŋ1 LEVEL - cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json | jq -rc ################################## JAKLIS LIKING_ME stars ${MY_PATH}/timeout.sh -t 20 \ ${MY_PATH}/jaklis/jaklis.py \ -k ~/.zen/game/players/${PLAYER}/secret.dunikey \ stars -p ${liking_me} > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json + cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/${liking_me}.Gstars.json | jq -rc + ## ZOMBIE PROTECTION - PURGE AFTER 365 DAYS find ~/.zen/game/players/${PLAYER}/FRIENDS/* -mtime +365 -type d -exec rm -Rf '{}' \; 2>/dev/null diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index 8cf216f7..669133be 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -32,7 +32,7 @@ echo "VOEUX : ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt " echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%" -for v in $(cat ~/.zen/game/players/*/voeux/*/.title); do +for v in $(cat ~/.zen/game/players/*/voeux/*/*/.title); do g1pub=$(grep -r $v ~/.zen/game/players/*/voeux/ 2>/dev/null | rev | cut -d '/' -f 2 | rev ) # echo "$v : $g1pub" # echo '------------------------------------------------------------------' @@ -52,7 +52,7 @@ select voeu in "${vlist[@]}"; do *) echo "IMPRESSION $voeu" voeu=$(echo $voeu | cut -d ':' -f2) ## Get G1PUB part - TITLE=$(cat ~/.zen/game/world/$voeu/.pepper) ## Get Voeu title (pepper) = simple GUI form + Name collision => Voeu fusion + TITLE=$(echo $voeu | cut -d ':' -f1) ## Get Voeu title VOEUXNS=$(ipfs key list -l | grep $voeu | cut -d ' ' -f1) @@ -64,14 +64,14 @@ select voeu in "${vlist[@]}"; do "TW") echo "Changer de Gateway $myIPFS ?" read GW && [[ ! $GW ]] && GW="$myIPFS" - qrencode -s 12 -o "$HOME/.zen/game/world/$voeu/QR.WISHLINK.png" "$GW/ipns/$VOEUXNS" - convert $HOME/.zen/game/world/$voeu/QR.WISHLINK.png -resize 600 ~/.zen/tmp/START.png + qrencode -s 12 -o "$HOME/.zen/game/world/$TITLE/$voeu/QR.WISHLINK.png" "$GW/ipns/$VOEUXNS" + convert $HOME/.zen/game/world/$TITLE/$voeu/QR.WISHLINK.png -resize 600 ~/.zen/tmp/START.png echo " QR code $TITLE : $GW/ipns/$VOEUXNS" break ;; "G1") - qrencode -s 12 -o "$HOME/.zen/game/world/$voeu/G1PUB.png" "$voeu" - convert $HOME/.zen/game/world/$voeu/G1PUB.png -resize 600 ~/.zen/tmp/START.png + qrencode -s 12 -o "$HOME/.zen/game/world/$TITLE/$voeu/G1PUB.png" "$voeu" + convert $HOME/.zen/game/world/$TITLE/$voeu/G1PUB.png -resize 600 ~/.zen/tmp/START.png break ;; esac