diff --git a/_12345.sh b/_12345.sh index f44812a5..8b5dc303 100755 --- a/_12345.sh +++ b/_12345.sh @@ -104,7 +104,6 @@ while true; do fi PLAYERONE=($(ls -t ~/.zen/game/players/ | grep "@" 2>/dev/null)) [[ ${PLAYERONE[@]} == "" ]] \ - && echo "EMPTY ASTROPORT - NO PLAYER - NO PUBLISHING" \ && duree=0 && lastrun=${MOATS} && continue # RESPECT LOWMODE. REMOVE THAT LINE TO FORCE IPFS WAKING UP diff --git a/install.sh b/install.sh index ae520955..2460fbb4 100755 --- a/install.sh +++ b/install.sh @@ -91,35 +91,6 @@ for i in cmatrix cowsay fonts-hack-ttf; do fi done -if [[ $(which X 2>/dev/null) ]]; then - echo "#############################################" - echo "######### INSTALL 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 - - - if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then - echo "#############################################" - echo " ### CONFIGURATION KODI FR PLUGIN ## " - echo "#############################################" - ( - mkdir -p ~/.zen/tmp/kodi - echo "PATIENTEZ..." - ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc2jg96KvQrLs5R29jn3hjUb1ViMWzeygtPR59fTP6AVT - echo '## INSTALL FRANCETV + VSTREAM + FILMSFORACTION' - mv ~/.kodi ~/.kodi.back 2>/dev/null - mv ~/.zen/tmp/kodi ~/.kodi - echo "Now run kodi and update plugins" - ) & - fi -fi - #### GIT CLONE ############################################################### echo "#############################################" echo "=== CODE CLONING TO '~/.zen/Astroport.ONE' ===" @@ -156,6 +127,19 @@ for i in pip setuptools wheel amzqr pdf2docx pyppeteer cryptography Ed25519 base [[ $? != 0 ]] && echo "INSTALL $i FAILED." && echo "python -m pip install -U $i FAILED." >> /tmp/install.errors.log && continue done +if [[ $(which X 2>/dev/null) ]]; then + echo "#############################################" + echo "######### INSTALL 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 + echo "#############################################" echo "######### IMPRIMANTE & G1BILLET ##############" echo "#############################################" @@ -237,6 +221,27 @@ echo "/ip4/127.0.0.1/tcp/5001" > ~/.ipfs/api echo "=== SETUP ASTROPORT" ~/.zen/Astroport.ONE/setup.sh + + +if [[ $(which X 2>/dev/null) ]]; then + + if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then + echo "#############################################" + echo " ### CONFIGURATION KODI FR PLUGIN ## " + echo "#############################################" + ( + mkdir -p ~/.zen/tmp/kodi + echo "PATIENTEZ..." + ipfs get -o ~/.zen/tmp/kodi/ /ipfs/Qmc2jg96KvQrLs5R29jn3hjUb1ViMWzeygtPR59fTP6AVT + echo '## INSTALL FRANCETV + VSTREAM + FILMSFORACTION' + mv ~/.kodi ~/.kodi.back 2>/dev/null + mv ~/.zen/tmp/kodi ~/.kodi + echo "Now run kodi and update plugins" + ) & + fi +fi + + end=`date +%s` echo Installation time was `expr $end - $start` seconds. echo "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"