forked from STI/Astroport.ONE
x11 & wayland
This commit is contained in:
parent
5249433ee5
commit
86354516c6
2
12345.sh
2
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
|
||||
|
||||
|
|
|
@ -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<br>"
|
||||
echo "<a href='$myIPFS/ipns/${ASTRONAUTENS}'>TW REFRESH FAILED</a>"
|
||||
echo ">> %%% WARNING %%%"
|
||||
echo "------------------------------------------------"
|
||||
echo "LAST : ${myIPFS}/ipfs/${LASTCHAIN}"
|
||||
echo "NOW : ${myIPFS}/ipfs/${NOWCHAIN}"
|
||||
echo " * <a href='${myIPFS}/ipfs/${LASTCHAIN}'>LAST</a>"
|
||||
echo " *<a href='${myIPFS}/ipfs/${NOWCHAIN}'>NOW</a>"
|
||||
echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx"
|
||||
## SEND AN EMAIL ALERT TO PLAYER
|
||||
echo "TW REFRESH FAILED : $myIPFS/ipns/${ASTRONAUTENS}" > ~/.zen/tmp/result
|
||||
echo "------------------------------------------------" >> ~/.zen/tmp/result
|
||||
echo "<html><body><a href='$myIPFS/ipns/${ASTRONAUTENS}'>TW REFRESH FAILED</a>" > ~/.zen/tmp/result
|
||||
echo "<br>------------------------------------------------" >> ~/.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 "<br><a href='${myIPFS}/ipfs/${LASTCHAIN}'>ANCIENT</a>" >> ~/.zen/tmp/result
|
||||
echo "<br><a href='${myIPFS}/ipfs/${NOWCHAIN}'>NEW</a>" >> ~/.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 "<br> %%% WARNING %%%" >> ~/.zen/tmp/result
|
||||
echo "<br>------------------------------------------------" >> ~/.zen/tmp/result
|
||||
echo "<br>PLEASE REPAIR BY SAVING ONLINE</body></html>" >> ~/.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
|
||||
|
|
|
@ -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 ]] \
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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 : __ "
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -220,7 +220,7 @@ cat $core_file >> $html_file
|
|||
echo "</body></html>" >> $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"
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue