From 24a6b49567cdbd7b78766e9d312320a6392ae823 Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Fri, 2 Feb 2024 18:42:52 +0100
Subject: [PATCH] lighter

---
 install.sh | 28 +++++++++++++++++-----------
 setup.sh   | 26 ++++++++++++--------------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/install.sh b/install.sh
index d0a1b20c..12f1630e 100755
--- a/install.sh
+++ b/install.sh
@@ -121,14 +121,13 @@ sudo npm install -g tiddlywiki
 #~ ## DES SUGGESTIONS ?
 #~ ## CONTACTER support@qo-op.com
 #~ #################################################"
-echo "######### CONFIGURE MAILJET ############"
 ## MAILJET SSMTP RELAYING : ADD YOUR CREDENTIALS
-sudo cp ~/.zen/Astroport.ONE/templates/.ssmtprc /etc/ssmtp/ssmtp.conf
-sudo ln -s /usr/sbin/ssmtp /usr/bin/ssmtp
-sudo chmod 640 /etc/ssmtp/ssmtp.conf
-sudo chgrp mail /etc/ssmtp/ssmtp.conf
+#~ sudo cp ~/.zen/Astroport.ONE/templates/.ssmtprc /etc/ssmtp/ssmtp.conf
+#~ sudo ln -s /usr/sbin/ssmtp /usr/bin/ssmtp
+#~ sudo chmod 640 /etc/ssmtp/ssmtp.conf
+#~ sudo chgrp mail /etc/ssmtp/ssmtp.conf
 
-echo "$USER:support@g1sms.fr:mail.asycn.io:587" | (sudo su -c 'tee -a /etc/ssmtp/revaliases')
+#~ echo "$USER:support@g1sms.fr:mail.asycn.io:587" | (sudo su -c 'tee -a /etc/ssmtp/revaliases')
 
 ## Correct PDF restrictions for imagemagick
 echo "######### IMAGEMAGICK PDF ############"
@@ -152,7 +151,7 @@ echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo
 # python -m pip install -U silkaj
 # python -m pip install -U protobuf==3.19.0
 
-for i in pip setuptools wheel cryptography==3.4.8 Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes amzqr pdf2docx pyppeteer; do
+for i in pip setuptools wheel cryptography Ed25519 base58 google duniterpy pynacl pgpy pynentry SecureBytes amzqr pdf2docx pyppeteer; do
         echo ">>> Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
         python -m pip install --break-system-packages -U $i
         [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue
@@ -219,24 +218,31 @@ echo "=== SETUP ASTROPORT"
 echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
 echo "xXX ERRORS XXx"
 cat /tmp/install.errors.log
+echo "xXX please report any errors encountered during install  XXx"
 echo "################XXXX#########################"
-echo "Astroport.ONE Welcome Space Kitty"
+echo
+echo "#############################################"
+echo "Astroport.ONE - Web3 Information System over IPFS - "
 end=`date +%s`
 echo Execution time was `expr $end - $start` seconds.
 echo "#############################################"
-echo "Please finish keygen procedure"
+echo
+echo "### JOIN BOOSTRAP LIST #############################"
+echo "###  SET MAILJET CREDENTIALS...
+contact support@qo-op.com for initial UPlanet ~/.zen/MJ_APIKEY"
 echo "#############################################"
+echo "Continue with keygen procedure..."
 
 ##########################################################
     ## ON BOARDING PLAYER
     # ~/.zen/Astroport.ONE/start.sh
-    espeak "Welcome Space Kitty"
+    espeak "Welcome Space Kitty" 2>/dev/null
 
     #~ [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] \
     #~ && xdg-open "http://astroport.localhost:1234" \
     #~ || ~/.zen/Astroport.ONE/command.sh
 
-    xdg-open "https://pad.p2p.legal/keygen"
+    xdg-open "https://pad.p2p.legal/keygen" 2>/dev/null
 
 else
 
diff --git a/setup.sh b/setup.sh
index 1fc3c042..6098b39b 100755
--- a/setup.sh
+++ b/setup.sh
@@ -25,21 +25,20 @@ sudo ./setup.sh
 mkdir -p ~/.zen/tmp
 
 ########################################################################
-# CREATE ~/astroport FILESYSTEM GATE
-#~ echo '${TYPE};${MEDIAID};${YEAR};${TITLE};${SAISON};${GENRES};_IPNSKEY_;${RES};/ipfs/_IPFSREPFILEID_/$URLENCODE_FILE_NAME' > ~/Astroport/${PLAYER}/ajouter_video.modele.txt
-
+# open_with_linux.py install
 #######################################################################
+# DEPRECATED
 
-    echo "#############################################"
-    ## https://darktrojan.github.io/openwith/webextension.html"
-    ~/.zen/Astroport.ONE/open_with_linux.py install
+    #~ echo "#############################################"
+    #~ ## https://darktrojan.github.io/openwith/webextension.html"
+    #~ ~/.zen/Astroport.ONE/open_with_linux.py install
 
-    echo "#############################################
-    # NOURRISSEZ VOTRE BLOB depuis Firefox !!
-    # https://addons.mozilla.org/firefox/addon/open-with
-    #############################################
-    ##    $HOME/.zen/Astroport.ONE/ajouter_media.sh      ##
-    #############################################"
+    #~ echo "#############################################
+    #~ # NOURRISSEZ VOTRE BLOB depuis Firefox !!
+    #~ # https://addons.mozilla.org/firefox/addon/open-with
+    #~ #############################################
+    #~ ##    $HOME/.zen/Astroport.ONE/ajouter_media.sh      ##
+    #~ #############################################"
 
 ########################################################################
 # SUDO permissions
@@ -128,7 +127,6 @@ fi
 ### ADD 20h12.sh CRON ###############
 ~/.zen/Astroport.ONE/tools/cron_VRFY.sh ON
 
-echo "#############################################"
-## INSTALL yt-dlp & SYMLINK youtube-dl
+echo "##INSTALL yt-dlp & SYMLINK youtube-dl ##########################"
 ~/.zen/Astroport.ONE/youtube-dl.sh