From b8d16243e8897d503ead3ae496a0c3d178e8283b Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Sun, 8 Jan 2023 20:02:49 +0100
Subject: [PATCH] install better

---
 ASTROBOT/G1PalPay.sh          |  4 +++-
 ASTROBOT/VOEUX.refresh.sh     | 30 +++++++++++++++---------------
 install.sh                    |  2 +-
 kubo_v0.16.0_linux.install.sh |  8 ++++----
 4 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ASTROBOT/G1PalPay.sh b/ASTROBOT/G1PalPay.sh
index b73ebde5..82ef14ef 100755
--- a/ASTROBOT/G1PalPay.sh
+++ b/ASTROBOT/G1PalPay.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 ########################################################################
-# Version: 0.4
+# Version: 0.5
 # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
 ########################################################################
+# PAD COCODING : https://pad.p2p.legal/s/G1PalPay
+########################################################################
 MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 ME="${0##*/}"
diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh
index c2d91a1b..ecbf42ca 100755
--- a/ASTROBOT/VOEUX.refresh.sh
+++ b/ASTROBOT/VOEUX.refresh.sh
@@ -12,29 +12,29 @@ MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 # Inspect game wishes, refresh latest IPNS version
 # SubProcess Backup and chain
 PLAYER="$1" ## IPNS KEY NAME - G1PUB - PLAYER ...
-[[ ! $PLAYER ]] && echo "Please provide IPFS publish key" && exit 1
+[[ ! ${PLAYER} ]] && echo "Please provide IPFS publish key" && exit 1
 
 MOATS="$2"
 
-    PSEUDO=$(cat ~/.zen/game/players/$PLAYER/.pseudo 2>/dev/null)
-    G1PUB=$(cat ~/.zen/game/players/$PLAYER/.g1pub 2>/dev/null)
-    ASTRONS=$(cat ~/.zen/game/players/$PLAYER/.playerns 2>/dev/null)
+    PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
+    G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub 2>/dev/null)
+    ASTRONS=$(cat ~/.zen/game/players/${PLAYER}/.playerns 2>/dev/null)
 
     ## REFRESH ASTRONAUTE TW
-    ASTRONAUTENS=$(ipfs key list -l | grep $PLAYER | cut -d ' ' -f1)
-    [[ ! $ASTRONAUTENS ]] && echo "WARNING No $PLAYER in keystore --" && ASTRONAUTENS=$ASTRONS
-    [[ ! $ASTRONAUTENS ]] && echo "Missing $PLAYER IPNS KEY - CONTINUE --" && exit 1
+    ASTRONAUTENS=$(ipfs key list -l | grep ${PLAYER} | cut -d ' ' -f1)
+    [[ ! $ASTRONAUTENS ]] && echo "WARNING No ${PLAYER} in keystore --" && ASTRONAUTENS=$ASTRONS
+    [[ ! $ASTRONAUTENS ]] && echo "Missing ${PLAYER} IPNS KEY - CONTINUE --" && exit 1
 
 INDEX="$3"
-[[ ! $INDEX ]] && INDEX="$HOME/.zen/game/players/$PLAYER/ipfs/moa/index.html"
-[[ ! -s $INDEX ]] && echo "TW $PLAYER manquant" && exit 1
+[[ ! $INDEX ]] && INDEX="$HOME/.zen/game/players/${PLAYER}/ipfs/moa/index.html"
+[[ ! -s $INDEX ]] && echo "TW ${PLAYER} manquant" && exit 1
 
 mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu
 
 echo "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"
 ###############################
 ## EXTRACT G1Voeu from PLAYER TW
-echo "Exporting $PLAYER TW [tag[G1Voeu]]"
+echo "Exporting ${PLAYER} TW [tag[G1Voeu]]"
 rm -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.g1voeu.json
 tiddlywiki --load ${INDEX} --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu --render '.' "${PLAYER}.g1voeu.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1Voeu]]'
 
@@ -67,7 +67,7 @@ do
     if [[ -s $MY_PATH/G1${WISHNAME}.sh ]]; then
         echo "........................ Astrobot G1${WISHNAME}.sh program found !"
         echo "________________________________  Running it *****"
-        ${MY_PATH}/G1${WISHNAME}.sh "$INDEX" "$PLAYER" "$MOATS"
+        ${MY_PATH}/G1${WISHNAME}.sh "$INDEX" "${PLAYER}" "$MOATS"
         echo "________________________________   Finished ******"
     else
         echo "......................... G1${WISHNAME} REGULAR Ŋ1 RSS JSON"
@@ -82,10 +82,10 @@ do
         ## Copy tiddlers ...
         ##################################
         echo "NOW SEARCH Ŋ1 FRIENDS TW's FOR tag=G1${WISHNAME}"
-        echo "ls ~/.zen/game/players/$PLAYER/FRIENDS/*/index.html"
+        echo "ls ~/.zen/game/players/${PLAYER}/FRIENDS/*/index.html"
         echo "*********************************"
         ## Search in Local World (NB! G1Voeu TW copied by Connect_PLAYER_To_Gchange.sh)
-        FINDEX=($( ls $HOME/.zen/game/players/$PLAYER/FRIENDS/*/index.html))
+        FINDEX=($( ls $HOME/.zen/game/players/${PLAYER}/FRIENDS/*/index.html))
 
         for FRIENDTW in ${FINDEX[@]};
         do
@@ -121,8 +121,8 @@ do
         ipfs name publish -k $VOEUKEY /ipfs/$JSONIPFS   # PUBLISH $VOEUKEY
 
         ## MOVE INTO PLAYER AREA
-        echo "Ŋ1 FLUX ~/.zen/game/players/$PLAYER/G1${WISHNAME}/${G1PUB}"
-        mv -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/* ~/.zen/game/players/$PLAYER/G1${WISHNAME}/${G1PUB}/
+        echo "Ŋ1 FLUX ~/.zen/game/players/${PLAYER}/G1${WISHNAME}/${G1PUB}"
+        mv -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/* ~/.zen/game/players/${PLAYER}/G1${WISHNAME}/${G1PUB}/
 
 done < ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.g1wishes.txt
 
diff --git a/install.sh b/install.sh
index b30b6105..47acd75d 100755
--- a/install.sh
+++ b/install.sh
@@ -17,7 +17,7 @@ start=`date +%s`
 ########################################################################
 [[ ! $(which ipfs) ]] \
 && echo "bash <(wget -qO- https://git.p2p.legal/qo-op/Astroport.ONE/raw/branch/master/kubo_v0.16.0_linux.install.sh)" \
-&& architecture=$(uname -m) && [[ $architecture == "x86_64" ||  $architecture == "aarch64" ]] \
+&& architecture=$(uname -m) && [[ $architecture == "x86_64" ||  $architecture == "aarch64" || "$architecture" == "armv7l" ]] \
 && bash <(wget -qO- https://git.p2p.legal/qo-op/Astroport.ONE/raw/branch/master/kubo_v0.16.0_linux.install.sh) \
 || echo "=== Installez IPFS KUBO puis relancez Install ==="
 
diff --git a/kubo_v0.16.0_linux.install.sh b/kubo_v0.16.0_linux.install.sh
index 1f958d35..047c067a 100644
--- a/kubo_v0.16.0_linux.install.sh
+++ b/kubo_v0.16.0_linux.install.sh
@@ -9,17 +9,17 @@ architecture=$(uname -m)
 
 # Download appropriate version of kubo
 if [ "$architecture" == "x86_64" ]; then
-    wget https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-amd64.tar.gz
+    wget -O kubo.tar.gz https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-amd64.tar.gz
 elif [ "$architecture" == "aarch64" ]; then
-    wget https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-arm64.tar.gz
+    wget -O kubo.tar.gz https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-arm64.tar.gz
 elif [ "$architecture" == "armv7l" ]; then
-    wget https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-arm.tar.gz
+    wget -O kubo.tar.gz https://dist.ipfs.tech/kubo/v0.16.0/kubo_v0.16.0_linux-arm.tar.gz
 else
     echo "Error: Unknown architecture"
     exit 1
 fi
 
-tar -xvzf kubo_v0.16.0_linux-$architecture.tar.gz
+tar -xvzf kubo.tar.gz
 
 cd kubo