From 5c2527a96fdafbcd6b636161bda449e0640f956b Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 24 Aug 2022 15:33:41 +0200 Subject: [PATCH] Install Astroport.ONE / Astronaut, Wishes & TW / Upgrade Real Life Terraforming Game --- installnot.sh => install.sh | 26 ++++++++++++-------------- reset.sh | 18 ------------------ 2 files changed, 12 insertions(+), 32 deletions(-) rename installnot.sh => install.sh (88%) mode change 100644 => 100755 delete mode 100755 reset.sh diff --git a/installnot.sh b/install.sh old mode 100644 new mode 100755 similarity index 88% rename from installnot.sh rename to install.sh index 564be48b..7566e26a --- a/installnot.sh +++ b/install.sh @@ -10,17 +10,15 @@ ME="${0##*/}" [ $(id -u) -eq 0 ] && echo "LANCEMENT root INTERDIT. Utilisez un simple utilisateur du groupe \"sudo\" SVP" && exit 1 -echo "Just for reference. PLEASE ADAPT" && exit - ######################################################################## [[ ! $(which ipfs) ]] && echo "=== Installez IPFS !!" && echo "https://docs.ipfs.io/install/command-line/#official-distributions" && exit 1 # MAIN # SI AUCUNE CLEF DE STATION... -if [[ ! -f ~/.zen/secret.dunikey ]]; +if [[ ! -f ~/.zen/game/players/.current/secret.dunikey ]]; then # Check requirements -echo "AstrXbian installateur pour distributions DEBIAN et dérivées : LinuxMint (https://www.linuxmint.com/) ou XBIAN (https://xbian.org) recommandées" +echo "Astroport.ONE installateur pour distributions DEBIAN et dérivées : LinuxMint (https://www.linuxmint.com/) ou XBIAN (https://xbian.org) recommandées" echo "Appuyez sur ENTRER pour commencer."; read TEST; [[ "$TEST" != "" ]] && echo "SORTIE" && exit 0 ## Ajouter confirmation à chaque nouvelle étape (+explications) echo ; echo "Mise à jour des dépots de votre distribution..." sudo apt-get update @@ -32,14 +30,14 @@ sudo apt-get update sudo apt install -y $i; done -for i in git fail2ban netcat-traditional inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev; do +for i in git fail2ban npm netcat-traditional inotify-tools curl net-tools libsodium* python3-dev python3-pip python3-setuptools python3-wheel python3-dotenv mpack libssl-dev libffi-dev; do 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 fi done -for i in build-essential qrencode jq bc file gawk yt-dlp ffmpeg sqlite dnsutils v4l-utils vlc mp3info musl-dev openssl* cargo detox nmap httrack html2text ssmtp imagemagick ttf-mscorefonts-installer libcurl4-openssl-dev; do +for i in build-essential qrencode jq bc file gawk yt-dlp ffmpeg sqlite dnsutils v4l-utils espeak vlc mp3info musl-dev openssl* cargo detox nmap httrack html2text ssmtp imagemagick ttf-mscorefonts-installer libcurl4-openssl-dev; do 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 @@ -47,7 +45,6 @@ for i in build-essential qrencode jq bc file gawk yt-dlp ffmpeg sqlite dnsutils done ### Install tiddlywiki node.js -sudo apt install -y npm sudo npm install -g tiddlywiki @@ -57,8 +54,8 @@ sudo npm install -g tiddlywiki sudo apt-get install kodi -y;\ ${MY_PATH}/.install/kodi_uqload_downloader.sh -echo "## INSTALLATION AstroGEEK OpenCV = 'Intelligence Amie' " -sudo apt-get install python3-opencv -y +# echo "## INSTALLATION AstroGEEK OpenCV = 'Intelligence Amie' " +# sudo apt-get install python3-opencv -y ## Correct PDF restrictions for imagemagick echo "# Correction des droits export PDF imagemagick" @@ -79,15 +76,15 @@ python3 -m pip install -U protobuf==3.19.0 if [[ "$USER" == "pi" ]]; then ## PROPOSE QR_CODE PRINTER SUR RPI - echo "Ambassade? Souhaitez vous ajouter imprimante 'brother_ql'? Saisissez OUI, sinon laissez vide et tapez sur ENTRER" + echo "Ambassade? Ajouter imprimante 'brother_ql'? Saisissez OUI, sinon laissez vide et tapez sur ENTRER" read saisie if [[ $saisie != "" ]]; then sudo apt install printer-driver-all cups -y sudo pip3 install brother_ql sudo cupsctl --remote-admin sudo usermod -aG lpadmin pi - sudo usermod -a -G gammu pi sudo usermod -a -G tty pi + sudo usermod -a -G lp pi fi fi @@ -107,7 +104,7 @@ git clone https://git.p2p.legal/qo-op/Astroport.ONE.git ## Scripts pour systemd ou InitV (xbian) -echo "=== Activation SYSTEM IPFS" +echo "=== Astroport SYSTEM IPFS" ~/.zen/astrXbian/.install/ipfs_alone.sh ######################################################################## @@ -170,11 +167,12 @@ echo ">>> INFO : Ajoutez l'extension 'OpenWith' à votre navigateur !! if [[ "$USER" != "xbian" ]] then ## Desktop install - echo "INITIALISATIOn Astroport/KODI" + echo "INITIALISATION Astroport" echo "Appuyez sur la touche ENTREE pour démarrer le mode Aventure" echo "sinon interrompez ici l'installation, et activez votre Ambassade ~/.zen/Astroport.ONE/start.sh" read ~/.zen/Astroport.ONE/adventure.sh + # # ~/.zen/astrXbian/ISOconfig.sh else ## Rpi Xbian install. @@ -198,7 +196,7 @@ Astroport/KODI (Gchange) ======================== Connectez-vous sur https://gchange.fr avec vos identifiants -$(cat ~/.zen/secret.june) +$(cat ~/.zen/game/players/.current/secret.june) https://astroport.com " diff --git a/reset.sh b/reset.sh deleted file mode 100755 index 1e885bf1..00000000 --- a/reset.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# RESET PLAYERS FROM ASTROPORT !! -# USED FOR DEV MOD -# -#_____ REINIT COMMAND____ - -for p in $(ls ~/.zen/game/players/); do rm -Rf ~/.zen/game/players/$p -for k in $(ipfs key list | grep $p); do ipfs key rm $k; done; done - -# Todo -echo " -RESTAURER ANCIENNE CONFIG IPFS -~/.ipfs/keystore.astrXbian -~/.ipfs/config.astrXbian" - - -#_____ALL PLAYERS REMOVAL____ -