make message HTML & add FUN
This commit is contained in:
parent
841f3f4422
commit
2eb14fd885
|
@ -91,7 +91,7 @@ make install
|
|||
```
|
||||
If your computer is running 24/24, you can join our "Boostrap list" & officially become a [TW UPlanet hoster](https://talk.tiddlywiki.org/t/uplanet-a-planet-full-of-tws/8193?u=papiche)
|
||||
|
||||
> PLEASE REPORT ANY ISSUES
|
||||
> DOCKER MODE NOT READY TO USE !! FOLLOW AND ADAPT NEXT STEP
|
||||
|
||||
## DESKTOP : Using install.sh script
|
||||
|
||||
|
|
|
@ -548,18 +548,18 @@ echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$PLAYER ASTROF
|
|||
|
||||
### SEND AstroID and ZenCard to EMAIL
|
||||
(
|
||||
echo "✅ UPlanet : ZenCard<br>Print your ZenCard : Public key (and wallet address)" > ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<html><body>✅ UPlanet : ZenCard<br>Print your ZenCard : Public key (and wallet address)" > ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br>It is your personal ZenCard. Use it to receive Zen." >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br><a href='$myIPFS/$IASTRO'>ẐenCard</a>" >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br><a href='$myIPFSGW/$IASTRO'>ẐenCard</a><br><img src='$myIPFSGW/$IASTRO'\></body></html>" >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
|
||||
$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt
|
||||
|
||||
#~ mpack -a -s "✅ UPlanet : ZenCard" -d ~/.zen/tmp/${MOATS}/intro.txt \
|
||||
#~ ~/.zen/tmp/${MOATS}/pseudo.png ${PLAYER}
|
||||
|
||||
echo "✅ UPlanet : AstroID ($PASS)<br>Print your AstroID : Private control key (secured by $PASS)" > ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<html><body>✅ UPlanet : AstroID ($PASS)<br>Print your AstroID : Private control key (secured by $PASS)" > ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br>Use it to send Zen to other Uplanet players https://qo-op.com" >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br><a href='$myIPFS/$ASTROQR'>AstroID</a>" >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
echo "<br><a href='$myIPFSGW/$ASTROQR'>AstroID</a><br><img src='$myIPFSGW/$ASTROQR'\></body></html>" >> ~/.zen/tmp/${MOATS}/intro.txt
|
||||
|
||||
$MY_PATH/../tools/mailjet.sh "${PLAYER}" ~/.zen/tmp/${MOATS}/intro.txt
|
||||
|
||||
|
|
12
install.sh
12
install.sh
|
@ -65,6 +65,18 @@ for i in qrencode pv gnupg pandoc ca-certificates basez jq bc file gawk ffmpeg d
|
|||
fi
|
||||
done
|
||||
|
||||
echo "#############################################"
|
||||
echo "######### FUN INSTALL ASCII ART TOOLS ######"
|
||||
echo "#############################################"
|
||||
for i in cmatrix cowsay; 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 [[ $XDG_SESSION_TYPE == 'x11' ]]; then
|
||||
echo "#############################################"
|
||||
echo "######### INSTALL DESKTOP TOOLS ######"
|
||||
|
|
|
@ -26,14 +26,8 @@ pseudo=$(echo $mail | cut -d '@' -f 1)
|
|||
messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP
|
||||
|
||||
SUBJECT="[UPlanet] $pseudo : $(myHostName)"
|
||||
MESSAGEUP="MESSAGE
|
||||
===
|
||||
"
|
||||
|
||||
MESSAGESIGN="---
|
||||
Astroport $(myHostName)
|
||||
$(myIpfsGw)/ipns/$IPFSNODEID
|
||||
"
|
||||
MESSAGESIGN="---<br>Astroport <a href=$(myIpfsGw)/ipns/$IPFSNODEID>$(myHostName)</a>"
|
||||
|
||||
echo "
|
||||
########################################################################
|
||||
|
@ -60,21 +54,14 @@ export MJ_APIKEY_PRIVATE='58256ba8ea62f68965879f53bbb29f90'
|
|||
export SENDER_EMAIL='support@g1sms.fr'
|
||||
export RECIPIENT_EMAIL=${mail}
|
||||
|
||||
# MESSAGEUP HEADER
|
||||
echo "$MESSAGEUP" > ~/.zen/tmp/email.txt
|
||||
|
||||
# + HTML in FILE
|
||||
[[ -s $messfile ]] && cat $messfile >> ~/.zen/tmp/email.txt \
|
||||
|| echo "$messfile" >> ~/.zen/tmp/email.txt
|
||||
|
||||
echo $MESSAGESIGN >> ~/.zen/tmp/email.txt
|
||||
|
||||
EMAILZ=$(ipfs add -q ~/.zen/tmp/email.txt)
|
||||
echo "/ipfs/${EMAILZ}"
|
||||
|
||||
TEXTPART=$(cat ~/.zen/tmp/email.txt | sed ':a;N;$!ba;s/\n/\\n/g' | tr '"' '\\\"')
|
||||
HTMLPART=$(cat ~/.zen/tmp/email.txt | sed ':a;N;$!ba;s/\n/<br>/g' | tr '"' '\\\"')
|
||||
|
||||
export TEXTPART="$(myIpfsGw)/ipfs/${EMAILZ}"
|
||||
|
||||
json_payload='{
|
||||
|
@ -98,7 +85,7 @@ json_payload='{
|
|||
],
|
||||
"Subject": "'${SUBJECT}'",
|
||||
"TextPart": "'$(myIpfsGw)/ipfs/${EMAILZ}'",
|
||||
"HTMLPart": "<h3>You have a <br><a href=\"'$(myIpfsGw)'/ipfs/'${EMAILZ}'\">MESSAGE</a>!</h3><br />May the good vibes be with you!<br>Astroport UPlanet"
|
||||
"HTMLPart": "<h3>You have a <br><a href=\"'$(myIpfsGw)'/ipfs/'${EMAILZ}'\">MESSAGE</a>!</h3><br />May the good vibes be with you!<br>'${MESSAGESIGN}'"
|
||||
}
|
||||
]
|
||||
}'
|
||||
|
@ -115,6 +102,8 @@ curl -s \
|
|||
-d "$json_payload"
|
||||
|
||||
# This call sends an email to one recipient.
|
||||
#~ TEXTPART=$(cat ~/.zen/tmp/email.txt | sed ':a;N;$!ba;s/\n/\\n/g' | tr '"' '\\\"')
|
||||
#~ HTMLPART=$(cat ~/.zen/tmp/email.txt | sed ':a;N;$!ba;s/\n/<br>/g' | tr '"' '\\\"')
|
||||
#~ curl -s \
|
||||
#~ -X POST \
|
||||
#~ --user "$MJ_APIKEY_PUBLIC:$MJ_APIKEY_PRIVATE" \
|
||||
|
|
Loading…
Reference in New Issue