From ec3ad83c13281ebfea416117d339d8cf31869fea Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 25 Nov 2022 14:02:58 +0100
Subject: [PATCH] install

---
 12345.sh          |  2 +-
 install.sh        | 17 ++++++++++++-----
 tools/VISA.new.sh | 14 ++++++--------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/12345.sh b/12345.sh
index e103ecd5..b0d6f176 100755
--- a/12345.sh
+++ b/12345.sh
@@ -80,7 +80,7 @@ while true; do
 
     ## CHECK 12345 PORT RUNNING (STATION FoF MAP)
     maprunning=$(ps auxf --sort=+utime | grep -w '_12345.sh' | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1)
-    [[ ! $maprunning ]] && ($MY_PATH/_12345.sh &) && echo '(ᵔ◡◡ᵔ) LAUNCHING ${myHTTP}'$myIP:'12345 (ᵔ◡◡ᵔ)'
+    [[ ! $maprunning ]] && ($MY_PATH/_12345.sh &) && echo '(ᵔ◡◡ᵔ) LAUNCHING '${myHTTP}$myIP:'12345 (ᵔ◡◡ᵔ)'
 
     ############### ACTIVATE USE ON QUICK IPFS DRIVE
     ### CREATE IPNS KEY - ACTIVATE WHITH ENOUGH BOOTSTRAP
diff --git a/install.sh b/install.sh
index eab5f197..bf91ad80 100755
--- a/install.sh
+++ b/install.sh
@@ -33,6 +33,7 @@ echo "$USER appuyez sur ENTRER."; read TEST;  [[ "$TEST" != "" ]] && echo "SORTI
 echo "#############################################"
 echo "###### IPFS BIOS INSTALL ##############################"
 echo "################  CRYPTO TW Ŋ1 PROTOCOL #############"
+echo "tail -f /tmp/install.errors.log"
 echo "##################################################"
 
 echo ; echo "Mise à jour des dépots de votre distribution..."
@@ -43,7 +44,7 @@ sudo apt-get update
     if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         [[ $XDG_SESSION_TYPE == 'x11' ]] && sudo apt install -y $i;
-        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.failed.log && continue
+        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.errors.log && continue
     fi
 done
 
@@ -55,7 +56,7 @@ for i in git fail2ban npm netcat-traditional inotify-tools curl net-tools libsod
     if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         sudo apt install -y $i
-        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.failed.log && continue
+        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.errors.log && continue
 
     fi
 done
@@ -67,7 +68,7 @@ for i in qrencode basez jq bc file gawk yt-dlp ffmpeg dnsutils ntpdate v4l-utils
     if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         sudo apt install -y $i
-        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.failed.log && continue
+        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.errors.log && continue
 
     fi
 done
@@ -78,7 +79,7 @@ echo "#############################################"
 ##########################################################
 echo "### INSTALL TW node.js"
 sudo npm install -g tiddlywiki sjcl-cli
-[[ $? != 0 ]] && echo "INSTALL tiddlywikiFAILED." && echo "INSTALL tiddlywiki FAILED." >> /tmp/install.failed.log && continue
+[[ $? != 0 ]] && echo "INSTALL tiddlywikiFAILED." && echo "INSTALL tiddlywiki FAILED." >> /tmp/install.errors.log && continue
 
 echo "#############################################"
 echo "######### PATIENCE #################"
@@ -116,9 +117,11 @@ echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo
 for i in pip setuptools wheel cryptography==3.4.8 Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes; do
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         sudo python3 -m pip install -U $i
-        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python3 -m pip install -U $i FAILED." >> /tmp/install.failed.log && continue
+        [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python3 -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue
 done
 
+cat /tmp/install.errors.log
+
 echo "#############################################"
 echo "######### PATIENCE ######################"
 echo "#############################################"
@@ -183,6 +186,9 @@ fi
 mkdir -p ~/Astroport/film
 mkdir -p ~/Astroport/serie
 mkdir -p ~/Astroport/anime
+mkdir -p ~/Astroport/page
+mkdir -p ~/Astroport/web
+mkdir -p ~/Astroport/video
 echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/ajouter_video.modele.txt
 
 
@@ -223,6 +229,7 @@ echo "# ADDING <<<Astroport>>>  DESKTOP SHORTCUT"
 [[ -d ~/Desktop ]] && sed "s/_USER_/$USER/g" ~/.zen/Astroport.ONE/astroport.desktop > ~/Desktop/astroport.desktop && chmod +x ~/Desktop/astroport.desktop
 
 mkdir -p ~/.zen/tmp
+
 echo "#############################################"
 
 ## SYMLINK youtube-dl TO yt-dlp
diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh
index 8b978d74..0044f699 100755
--- a/tools/VISA.new.sh
+++ b/tools/VISA.new.sh
@@ -32,12 +32,10 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(
 ## Chargement TW !!!
 if [[ $SALT != "" && PEPPER != "" ]]; then
     ASTRO=""
-    echo "$SALT"
-    echo "$PEPPER"
     ipfs key rm gchange 2>/dev/null
     rm -f ~/.zen/tmp/gchange.key
-    ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/gchange.key "$SALT" "$PEPPER"
-    ASTRONAUTENS=$(ipfs key import gchange -f pem-pkcs8-cleartext ~/.zen/tmp/gchange.key )
+    ${MY_PATH}/keygen -t ipfs -o ~/.zen/tmp/gchange.key "$SALT" "$PEPPER" 2>/dev/null
+    ASTRONAUTENS=$(ipfs key import gchange -f pem-pkcs8-cleartext ~/.zen/tmp/gchange.key 2>/dev/null)
     echo "/ipns/${ASTRONAUTENS}"
 
     mkdir -p ~/.zen/tmp/TW
@@ -55,9 +53,9 @@ if [[ $SALT != "" && PEPPER != "" ]]; then
     else
 
         # EXTRACTION & UPDATE myIP
-        rm -f ~/.zen/tmp/miz.json
-        tiddlywiki --load ~/.zen/tmp/TW/index.html --output ~/.zen/tmp --render '.' 'miz.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion'
-        OLDIP=$(cat ~/.zen/tmp/miz.json | jq -r .[].secret)
+        rm -f ~/.zen/tmp/MadeInZion.json
+        tiddlywiki --load ~/.zen/tmp/TW/index.html --output ~/.zen/tmp --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion'
+        OLDIP=$(cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret)
 
         echo "TW OFFICIAL GATEWAY : http://$OLDIP:8080//ipns/${ASTRONAUTENS}"
         if [[ ! -d ~/.zen/game/players/$PLAYER/ipfs/moa ]]; then
@@ -77,7 +75,7 @@ echo "=============================================
 MadeInZion DIPLOMATIC PASSPORT
 =============================================
 A cryptographic key pair to control your P2P Digital Life.
-Solar Punk garden forest terraforming game.
++ Solar Punk garden forest terraforming game.
 =============================================
 Bienvenue 'Astronaute'"; sleep 1