diff --git a/install.sh b/install.sh index ec223145..2526396f 100755 --- a/install.sh +++ b/install.sh @@ -42,20 +42,11 @@ echo ; echo "Mise à jour des dépots de votre distribution..." #~ [[ $XDG_SESSION_TYPE == 'x11' ]] && sudo add-apt-repository ppa:obsproject/obs-studio sudo apt-get update - - for i in x11-utils xclip zenity chromium kodi; do - 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.errors.log && continue - fi -done - echo "#############################################" -echo "######### PATIENCE ####" +echo "######### BASIC & PYTHON3 PACKAGE ####" echo "#############################################" -for i in git make cmake fail2ban npm netcat-traditional inotify-tools curl net-tools libsodium* libcurl4-openssl-dev python3-pip python3-setuptools python3-wheel python3-dotenv python3-gpg python3-jwcrypto python3-brotli mpack; do +for i in git make cmake fail2ban npm netcat-traditional chromium inotify-tools curl net-tools libsodium* libcurl4-openssl-dev python3-pip python3-setuptools python3-wheel python3-dotenv python3-gpg python3-jwcrypto python3-brotli mpack; 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 @@ -64,7 +55,7 @@ for i in git make cmake fail2ban npm netcat-traditional inotify-tools curl net-t fi done echo "#############################################" -echo "######### PATIENCE ######" +echo "######### MULTIMEDIA TOOLS ######" echo "#############################################" # removed : sqlite for i in qrencode pv gnupg ca-certificates basez jq bc file gawk yt-dlp ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text ssmtp imagemagick; do @@ -76,37 +67,50 @@ for i in qrencode pv gnupg ca-certificates basez jq bc file gawk yt-dlp ffmpeg d fi done +if [[ $XDG_SESSION_TYPE == 'x11' ]]; then +echo "#############################################" +echo "######### DESKTOP TOOLS ######" +echo "#############################################" for i in x11-utils xclip zenity kodi; 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; + [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "INSTALL $i FAILED." >> /tmp/install.errors.log && continue + fi +done +fi + #### GIT CLONE ############################################################### +echo "#############################################" echo "=== CLONAGE CODE '~/.zen/Astroport.ONE' depuis https://github.com" +echo "#############################################" mkdir -p ~/.zen cd ~/.zen git clone --depth 1 https://github.com/papiche/Astroport.ONE.git # TODO INSTALL FROM IPFS / IPNS echo "#############################################" -echo "######### PATIENCE ############" +echo "######### NODEJS & TIDDLYWIKI ############" echo "#############################################" ########################################################## -echo "### INSTALL TW node.js" sudo npm install -g tiddlywiki [[ $? != 0 ]] && echo "INSTALL tiddlywikiFAILED." && echo "INSTALL tiddlywiki FAILED." >> /tmp/install.errors.log && continue -echo "#############################################" -echo "######### PATIENCE #################" -echo "############################################# -### PROPOSITION DE LOGICIELS COMPLEMETAIRES -############################################# -## OpenCV = 'Vision par Ordinateur en Intelligence Amie' -# sudo apt-get install python3-opencv -y -## CONVERT AUDIO TO MIDI -# pip install basic-pitch -## CACHER LES VISAGES -# python3 -m pip install 'git+https://github.com/ORB-HD/deface' -## ... -## DES SUGGESTIONS ? -## CONTACTER support@qo-op.com -#################################################" - +#~ echo "#############################################" +#~ echo "######### PATIENCE #################" +#~ echo "############################################# +#~ ### PROPOSITION DE LOGICIELS COMPLEMETAIRES +#~ ############################################# +#~ ## OpenCV = 'Vision par Ordinateur en Intelligence Amie' +#~ # sudo apt-get install python3-opencv -y +#~ ## CONVERT AUDIO TO MIDI +#~ # pip install basic-pitch +#~ ## CACHER LES VISAGES +#~ # python3 -m pip install 'git+https://github.com/ORB-HD/deface' +#~ ## ... +#~ ## DES SUGGESTIONS ? +#~ ## CONTACTER support@qo-op.com +#~ #################################################" +echo "######### 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 @@ -116,14 +120,14 @@ sudo chgrp mail /etc/ssmtp/ssmtp.conf echo "$USER:support@g1sms.fr:mail.asycn.io:587" | (sudo su -c 'tee -a /etc/ssmtp/revaliases') ## Correct PDF restrictions for imagemagick -echo "# Correction des droits export PDF imagemagick" +echo "######### IMAGEMAGICK PDF ALLOW ############" if [[ $(cat /etc/ImageMagick-6/policy.xml | grep PDF) ]]; then cat /etc/ImageMagick-6/policy.xml | grep -Ev PDF > /tmp/policy.xml sudo cp /tmp/policy.xml /etc/ImageMagick-6/policy.xml fi echo "###########################" -echo "## INSTALL PYTHON CRYPTO LAYER " +echo "## PYTHON CRYPTO LAYER (♥‿‿♥)" echo "###########################" sudo ln -f -s /usr/bin/python3 /usr/bin/python echo 'export PATH=$PATH:$HOME/.local/bin' >> ~/.bashrc && source ~/.bashrc; echo "<<< CHECK YOUR >>> PATH=$PATH" @@ -143,7 +147,7 @@ done cat /tmp/install.errors.log echo "#############################################" -echo "######### PATIENCE ######################" +echo "######### IMPRESSION & G1BILLET ##############" echo "#############################################" ########### QRCODE : G1VISA / G1BILLET : PRINTER ############## @@ -177,19 +181,21 @@ if [[ $USER != 'xbian' ]]; then fi echo "#############################################" -echo "######### SETUP #########################" +echo "######### SYSTEM SETUP #########################" echo "#############################################" echo "=== SETUP IPFS SYSTEM" ~/.zen/Astroport.ONE/tools/ipfs_setup.sh echo "/ip4/127.0.0.1/tcp/5001" > ~/.ipfs/api - ~/.zen/Astroport.ONE/setup.sh + if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' ]]; then +echo "#############################################" +echo " ### BONUS APP ## IPFS # KODI FR PLUGIN ## " +echo "#############################################" ( -echo " ### AUTO CONFIG ## IPFS # KODI FR PLUGIN ## " mkdir -p ~/.zen/tmp/kodi echo "PATIENTEZ..." ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc763hnsuTqSTDBNagmzca4fSzmcTp9kHoeosaPKC8QvK @@ -201,7 +207,7 @@ fi echo "#############################################" echo "#############################################" - echo "Astroport.ONE INSTALLATION FINISH" + echo "Astroport.ONE INSTALLATION FINISHED" end=`date +%s` echo Execution time was `expr $end - $start` seconds. echo "#############################################" @@ -214,7 +220,6 @@ echo "#############################################" ########################################################## ## ON BOARDING PLAYER # ~/.zen/Astroport.ONE/start.sh - ~/.zen/Astroport.ONE/tools/displaytimer.sh 3 espeak "Please create a player" [[ $XDG_SESSION_TYPE == 'x11' ]] \ && xdg-open "http://astroport.localhost:1234" \ diff --git a/youtube-dl.sh b/youtube-dl.sh index 3dca3760..c3272296 100755 --- a/youtube-dl.sh +++ b/youtube-dl.sh @@ -4,7 +4,7 @@ MY_PATH="`dirname \"$0\"`" MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized ME="${0##*/}" ######## YOUTUBE-DL ########## -## NOW INSTALL yt-dlp AND LINK TO youtube-dl +## NOW INSTALL yt-dlp AND LINK TO /usr/local/bin/youtube-dl if [[ ! -f /usr/local/bin/yt-dlp ]]; then sudo curl -L https://github.com/yt-dlp/yt-dlp/releases/latest/download/yt-dlp -o /usr/local/bin/yt-dlp && \ @@ -15,8 +15,8 @@ if [[ ! -f /usr/local/bin/yt-dlp ]]; then sudo cp ${ytdl} ${ytdl}.old && \ sudo rm ${ytdl} - sudo ln -s /usr/local/bin/yt-dlp /usr/local/bin/youtube-dl ## NOW youtube-dl is linked to yt-dlp (COMMANDS ARE THE SAME ?) + sudo ln -s /usr/local/bin/yt-dlp /usr/local/bin/youtube-dl ## NOW youtube-dl is linked to yt-dlp (COMMANDS ARE THE SAME) fi ## UPGRADE TO LATEST -ls -al /usr/local/bin/youtube-dl +# ls -al /usr/local/bin/youtube-dl