From 36d6cf972731b63ea4c6e4dc6edcb3a5f64d6f30 Mon Sep 17 00:00:00 2001 From: fred Date: Tue, 6 Feb 2024 12:45:46 +0100 Subject: [PATCH] 0 BUG --- RUNTIME/SECTOR.refresh.sh | 4 ++-- tools/jaklis/setup.sh | 4 +++- tools/mailjet.sh | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 0d04e977..efc83e3c 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -244,8 +244,8 @@ for SECTOR in ${SECTORS[@]}; do echo "JSON WISH WORLD READY /ipfs/${IAMAP}/world.js" ########################################################################################### ### APPLY ON APP MODEL TODATE REGIONNS LINKING - REGLAT=$(echo ${LAT} | cut -d '.' -f 1) - REGLON=$(echo ${LON} | cut -d '.' -f 1) + REGLAT=$(echo ${SLAT} | cut -d '.' -f 1) + REGLON=$(echo ${SLON} | cut -d '.' -f 1) REGION="_${REGLAT}_${REGLON}" TODATEREGIONNS=$(${MY_PATH}/../tools/keygen -t ipfs "${TODATE}${UPLANETNAME}${REGION}" "${TODATE}${UPLANETNAME}${REGION}") diff --git a/tools/jaklis/setup.sh b/tools/jaklis/setup.sh index 8eee70c9..9d6665d1 100755 --- a/tools/jaklis/setup.sh +++ b/tools/jaklis/setup.sh @@ -1,5 +1,6 @@ #!/bin/bash - +MY_PATH="`dirname \"$0\"`" # relative +MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized hasError=0 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 chmod u+x jaklis.py 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 echo "Setup done. You can use 'jaklis' command, try it." diff --git a/tools/mailjet.sh b/tools/mailjet.sh index 9dc38a44..993d841b 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -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) CLYUSER=$(printf '%s\n' "${LYUSER[@]}" | tac | tr '\n' '.' ) # CLYUSER=debrouille.la.geg. YOMAIN=$(echo ${mail} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com -pseudo="/ipns/${CLYUSER}${YOMAIN}.${myDOMAIN}" +pseudo="${CLYUSER}${YOMAIN}.${myDOMAIN}" #~ echo "PSEUDO=$pseudo" messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGEUP @@ -79,7 +79,7 @@ json_payload='{ { "From": { "Email": "'${SENDER_EMAIL}'", - "Name": "UPlanet" + "Name": "UPlanet Keeper" }, "To": [ { @@ -89,7 +89,7 @@ json_payload='{ ], "Bcc": [ { - "Email": "support@g1sms.fr", + "Email": "'${SENDER_EMAIL}'", "Name": "SUPPORT" } ],