This commit is contained in:
fred 2024-02-06 12:45:46 +01:00
parent 3e9b4a2e81
commit 36d6cf9727
3 changed files with 8 additions and 6 deletions

View File

@ -244,8 +244,8 @@ for SECTOR in ${SECTORS[@]}; do
echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js" echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js"
########################################################################################### ###########################################################################################
### APPLY ON APP MODEL TODATE REGIONNS LINKING ### APPLY ON APP MODEL TODATE REGIONNS LINKING
REGLAT=$(echo ${LAT} | cut -d '.' -f 1) REGLAT=$(echo ${SLAT} | cut -d '.' -f 1)
REGLON=$(echo ${LON} | cut -d '.' -f 1) REGLON=$(echo ${SLON} | cut -d '.' -f 1)
REGION="_${REGLAT}_${REGLON}" REGION="_${REGLAT}_${REGLON}"
TODATEREGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}") TODATEREGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}")

View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
hasError=0 hasError=0
for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do for i in gcc python3-pip python3-setuptools libpq-dev python3-dev python3-wheel; do
@ -13,6 +14,7 @@ done
pip3 install --break-system-packages -r requirements.txt || hasError=1 pip3 install --break-system-packages -r requirements.txt || hasError=1
chmod u+x jaklis.py chmod u+x jaklis.py
sudo ln -sf $(realpath jaklis.py) /usr/local/bin/jaklis || hasError=1 sudo ln -sf $(realpath jaklis.py) /usr/local/bin/jaklis || hasError=1
sudo cp ${MY_PATH}/.env /usr/local/bin/ || hasError=1
if [[ hasError -eq 0 ]]; then if [[ hasError -eq 0 ]]; then
echo "Setup done. You can use 'jaklis' command, try it." echo "Setup done. You can use 'jaklis' command, try it."

View File

@ -44,7 +44,7 @@ YUSER=$(echo ${mail} | cut -d '@' -f1) # YUSER=geg-la_debrouille
LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille) LYUSER=($(echo "$YUSER" | sed 's/[^a-zA-Z0-9]/\ /g')) # LYUSER=(geg la debrouille)
CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg. CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg.
YOMAIN=$(echo ${mail} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com YOMAIN=$(echo ${mail} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com
pseudo="/ipns/${CLYUSER}${YOMAIN}.${myDOMAIN}" pseudo="${CLYUSER}${YOMAIN}.${myDOMAIN}"
#~ echo "PSEUDO=$pseudo" #~ echo "PSEUDO=$pseudo"
messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP
@ -79,7 +79,7 @@ json_payload='{
{ {
"From": { "From": {
"Email": "'${SENDER_EMAIL}'", "Email": "'${SENDER_EMAIL}'",
"Name": "UPlanet" "Name": "UPlanet Keeper"
}, },
"To": [ "To": [
{ {
@ -89,7 +89,7 @@ json_payload='{
], ],
"Bcc": [ "Bcc": [
{ {
"Email": "support@g1sms.fr", "Email": "'${SENDER_EMAIL}'",
"Name": "SUPPORT" "Name": "SUPPORT"
} }
], ],