diff --git a/12345.sh b/12345.sh index d51372eb..6ee1fab5 100755 --- a/12345.sh +++ b/12345.sh @@ -109,7 +109,7 @@ while true; do COOKIE=$(echo "$REQ" | grep '^Cookie:' | cut -d ' ' -f2) echo "COOKIE=$COOKIE" ############### ############### ############### ############### - [[ $XDG_SESSION_TYPE == 'x11' ]] && espeak "Dong" >/dev/null 1>&2 & + [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && espeak "Dong" >/dev/null 1>&2 & ############################################################################ [[ $URL == "/test" || $URL == "" ]] && continue diff --git a/RUNTIME/PLAYER.refresh.sh b/RUNTIME/PLAYER.refresh.sh index 1036ef8d..7304183a 100755 --- a/RUNTIME/PLAYER.refresh.sh +++ b/RUNTIME/PLAYER.refresh.sh @@ -97,23 +97,23 @@ for PLAYER in ${PLAYERONE[@]}; do NOWCHAIN=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain) LASTCHAIN=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.chain.* | tail -n 1) - echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" - echo "TW REFRESH FAILED : $myIPFS/ipns/${ASTRONAUTENS}" + echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
" + echo "TW REFRESH FAILED" echo ">> %%% WARNING %%%" echo "------------------------------------------------" - echo "LAST : ${myIPFS}/ipfs/${LASTCHAIN}" - echo "NOW : ${myIPFS}/ipfs/${NOWCHAIN}" + echo " * LAST" + echo " *NOW" echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx" ## SEND AN EMAIL ALERT TO PLAYER - echo "TW REFRESH FAILED : $myIPFS/ipns/${ASTRONAUTENS}" > ~/.zen/tmp/result - echo "------------------------------------------------" >> ~/.zen/tmp/result + echo "TW REFRESH FAILED" > ~/.zen/tmp/result + echo "
------------------------------------------------" >> ~/.zen/tmp/result echo "" >> ~/.zen/tmp/result - echo "NOW CHAIN : ${myIPFS}/ipfs/${NOWCHAIN}" >> ~/.zen/tmp/result - echo "PREVIOUS : ${myIPFS}/ipfs/${LASTCHAIN}" >> ~/.zen/tmp/result + echo "
ANCIENT" >> ~/.zen/tmp/result + echo "
NEW" >> ~/.zen/tmp/result echo "" >> ~/.zen/tmp/result - echo " %%% WARNING %%%" >> ~/.zen/tmp/result - echo "------------------------------------------------" >> ~/.zen/tmp/result - echo "PLEASE REPAIR BY SAVING ONLINE" >> ~/.zen/tmp/result + echo "
%%% WARNING %%%" >> ~/.zen/tmp/result + echo "
------------------------------------------------" >> ~/.zen/tmp/result + echo "
PLEASE REPAIR BY SAVING ONLINE" >> ~/.zen/tmp/result echo "OR RUNNING CLI COMMAND : ipfs name publish --key=${PLAYER} /ipfs/${NOWCHAIN}" >> ~/.zen/tmp/result try=$(cat ~/.zen/game/players/${PLAYER}/ipfs/moa/.try 2>/dev/null) || try=3 diff --git a/RUNTIME/VISA.new.sh b/RUNTIME/VISA.new.sh index 032cc4b8..1445b370 100755 --- a/RUNTIME/VISA.new.sh +++ b/RUNTIME/VISA.new.sh @@ -54,7 +54,7 @@ if [[ $SALT != "" && PEPPER != "" ]]; then [[ $YOU ]] \ && ipfs --timeout 180s cat /ipns/${ASTRONAUTENS} > ~/.zen/tmp/${MOATS}/TW/index.html - [[ $XDG_SESSION_TYPE == 'x11' ]] \ + [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] \ && [[ -s ~/.zen/tmp/${MOATS}/TW/index.html ]] \ && echo "TW FOUND ENTER 'yes' TO RESET TW. HIT ENTER TO KEEP IT." \ && read ENTER \ @@ -477,7 +477,7 @@ DISCO="/?salt=${USALT}&pepper=${UPEPPER}" echo "--- PLAYER : ${PLAYER} - DATA PROTOCOL LAYER LOADED"; # ls ~/.zen/game/players/${PLAYER} -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}" && espeak "YOUR PASS IS $PASS" +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open "${myIPFS}/ipns/${ASTRONAUTENS}" && espeak "YOUR PASS IS $PASS" ################# PREPARE DOCKERIZATION #~ [[ -l ~/.zen/game/players/.current ]] \ diff --git a/ajouter_media.sh b/ajouter_media.sh index 6b33a52b..e0ed2998 100755 --- a/ajouter_media.sh +++ b/ajouter_media.sh @@ -899,7 +899,7 @@ if [[ -s ~/Astroport/${PLAYER}/${CAT}/${MEDIAID}/${MEDIAKEY}.dragdrop.json ]]; t echo "================================================" echo - [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "http://ipfs.localhost:8080/ipns/$ASTRONAUTENS" + [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open "http://ipfs.localhost:8080/ipns/$ASTRONAUTENS" else diff --git a/command.sh b/command.sh index 129cc967..f0eb2b0e 100755 --- a/command.sh +++ b/command.sh @@ -127,7 +127,7 @@ echo "$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null) TW/Moa" echo "$myIPFS/ipns/$ASTRONAUTENS" echo "Activation Réseau P2P Astroport !" -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open "http://ipfs.localhost:8080/ipns/$ASTRONAUTENS" +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open "http://ipfs.localhost:8080/ipns/$ASTRONAUTENS" echo PS3="$PLAYER choisissez : __ " diff --git a/install.sh b/install.sh index b231813a..088ed28b 100755 --- a/install.sh +++ b/install.sh @@ -37,7 +37,7 @@ echo "################ TW Ŋ1 PROTOCOL #############" echo "##################################################" echo ; echo "UPDATING SYSTEM REPOSITORY" -#~ [[ $XDG_SESSION_TYPE == 'x11' ]] && sudo add-apt-repository ppa:obsproject/obs-studio +#~ [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && sudo add-apt-repository ppa:obsproject/obs-studio sudo apt-get update echo "#############################################" @@ -77,7 +77,7 @@ for i in cmatrix cowsay; do fi done -if [[ $XDG_SESSION_TYPE == 'x11' ]]; then +if [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then echo "#############################################" echo "######### INSTALL DESKTOP TOOLS ######" echo "#############################################" @@ -201,7 +201,7 @@ echo "=== SETUP ASTROPORT" ~/.zen/Astroport.ONE/setup.sh -if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' ]]; then +if [[ $(which kodi) && $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then echo "#############################################" echo " ### BONUS APP ## IPFS # KODI FR PLUGIN ## " echo "#############################################" @@ -233,7 +233,7 @@ echo "#############################################" # ~/.zen/Astroport.ONE/start.sh espeak "Welcome Space Kitty" - #~ [[ $XDG_SESSION_TYPE == 'x11' ]] \ + #~ [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] \ #~ && xdg-open "http://astroport.localhost:1234" \ #~ || ~/.zen/Astroport.ONE/command.sh diff --git a/tools/TW.cache.sh b/tools/TW.cache.sh index 1c0bb140..7d1f6f21 100755 --- a/tools/TW.cache.sh +++ b/tools/TW.cache.sh @@ -64,7 +64,7 @@ fi fi dur=`expr $(date +%s) - $start` -[[ $XDG_SESSION_TYPE == 'x11' ]] && espeak "$dur seconds for $(cat ~/.zen/tmp/${MOATS}Astroport.json | jq -r .[].pseudo) TW caching" +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && espeak "$dur seconds for $(cat ~/.zen/tmp/${MOATS}Astroport.json | jq -r .[].pseudo) TW caching" echo "${ME} : (0‿‿0) Execution time was $dur seconds." exit 0 diff --git a/tools/VISA.print.sh b/tools/VISA.print.sh index 58d082d0..19ae5894 100755 --- a/tools/VISA.print.sh +++ b/tools/VISA.print.sh @@ -72,9 +72,9 @@ BILLETNAME=$(echo "$SALT" | sed 's/ /_/g') ## GET IMAGE FROM G1BILLET ENGINE cp ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.BILLET.jpg ~/.zen/tmp/${MOATS}/${PASS}.jpg -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/${PASS}.jpg +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open ~/.zen/tmp/${MOATS}/${PASS}.jpg -#~ [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.TW.png +#~ [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open ~/.zen/G1BILLET/tmp/g1billet/${PASS}/${BILLETNAME}.TW.png #~ [[ $LP ]] \ @@ -95,7 +95,7 @@ convert -gravity SouthEast -pointsize 30 -fill black -draw "text 100, 72 \"${PAS convert -gravity SouthEast -pointsize 16 -fill black -draw "text 10,25 \"$SALT\"" ~/.zen/tmp/${MOATS}/pass.png ~/.zen/tmp/${MOATS}/salt.png convert -gravity SouthEast -pointsize 16 -fill black -draw "text 10,10 \"$PEPPER\"" ~/.zen/tmp/${MOATS}/salt.png ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open ~/.zen/tmp/${MOATS}/ZenCard.${PASS}.jpg ## PRINT VISA [[ $LP ]] \ @@ -109,7 +109,7 @@ convert -gravity NorthWest -pointsize 15 -fill black -draw "text 20,2 \"$G1PUB\" composite -compose Over -gravity Center -geometry +0+0 ~/.zen/tmp/${MOATS}/one.png ${MY_PATH}/../images/Brother_600x400.png ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg [[ $LP ]] \ && brother_ql_create --model QL-700 --label-size 62 ~/.zen/tmp/${MOATS}/AstroID.${PASS}.jpg > ~/.zen/tmp/${MOATS}/toprint.bin 2>/dev/null \ diff --git a/tools/VOEUX.print.sh b/tools/VOEUX.print.sh index 95ca46fa..24c531a1 100755 --- a/tools/VOEUX.print.sh +++ b/tools/VOEUX.print.sh @@ -212,7 +212,7 @@ select zwish in "${vlist[@]}"; do convert -gravity southeast -pointsize 30 -fill black -draw "text 100,2 \"${GW}\"" ~/.zen/tmp/${MOATS}/g1voeu1.png ~/.zen/tmp/${MOATS}/g1voeu.png #~ echo "~/.zen/tmp/${MOATS}/g1voeu.png READY ?" - [[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open ~/.zen/tmp/${MOATS}/g1voeu.png + [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open ~/.zen/tmp/${MOATS}/g1voeu.png LP=$(ls /dev/usb/lp* 2>/dev/null | head -n1) [[ ! $LP ]] && echo "NO PRINTER FOUND - Brother QL700 validated" && continue diff --git a/tools/make_image_ipfs_index_carousel.sh b/tools/make_image_ipfs_index_carousel.sh index 68db9aaf..5906544a 100755 --- a/tools/make_image_ipfs_index_carousel.sh +++ b/tools/make_image_ipfs_index_carousel.sh @@ -220,7 +220,7 @@ cat $core_file >> $html_file echo "" >> $html_file htmlipfs=$(ipfs add -q $html_file) -[[ $XDG_SESSION_TYPE == 'x11' ]] && xdg-open http://ipfs.localhost:8080/ipfs/$htmlipfs +[[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]] && xdg-open http://ipfs.localhost:8080/ipfs/$htmlipfs echo "/ipfs/$htmlipfs" diff --git a/tools/my.sh b/tools/my.sh index c6ddb4fa..2a2dfb88 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -474,7 +474,7 @@ myASTROTUBE="https://$(myAstroTube)" ### -if [[ $XDG_SESSION_TYPE == 'x11' ]]; then +if [[ $XDG_SESSION_TYPE == 'x11' || $XDG_SESSION_TYPE == 'wayland' ]]; then # GET SCREEN DIMENSIONS screen=$(xdpyinfo | grep dimensions | sed -r 's/^[^0-9]*([0-9]+x[0-9]+).*$/\1/') width=$(echo $screen | cut -d 'x' -f 1)