From 35f933d208113f13a30591b3f58b876f2847372e Mon Sep 17 00:00:00 2001
From: fred <support@qo-op.com>
Date: Tue, 6 Dec 2022 14:49:27 +0100
Subject: [PATCH] tmp thing is happening better

---
 .gitignore       |  1 +
 G1BILLETS.sh     | 24 ++++++++++++------------
 MAKE_G1BILLET.sh | 36 ++++++++++++++++++------------------
 3 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index 85118b7..b4de47a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .env
 *.pyc
+tmp/
diff --git a/G1BILLETS.sh b/G1BILLETS.sh
index dbb4b03..42e6b19 100755
--- a/G1BILLETS.sh
+++ b/G1BILLETS.sh
@@ -40,7 +40,7 @@ NBbillets=6
 [[ ! -f ${MY_PATH}/images/g1${STYLE}.png ]] && echo "missing g1${STYLE}.jpg" && exit 1
 [[ ! -f ${MY_PATH}/images/logo${STYLE}.png ]] && echo "missing logo${STYLE}.jpg" && exit 1
 
-mkdir -p "/tmp/g1billet/${UNIQID}"
+mkdir -p "${MY_PATH}/tmp/g1billet/${UNIQID}"
 
 # CREATION DE $NBbillets BILLETS DE $MONTANT DU
 boucle=0;
@@ -52,12 +52,12 @@ do
 
     # CREATION CLEF BILLET
     BILLETPUBKEY=$(python3 ${MY_PATH}/key_create_dunikey.py "$NUMBER" "$SECRET")
-    rm -f /tmp/secret.dunikey
+    rm -f ${MY_PATH}/tmp/secret.dunikey
 
     [[ "$STYLE" == "astro" ]] \
-    && ${MY_PATH}/keygen -t ipfs -o /tmp/g1billet/${UNIQID}.ipns.key "$NUMBER" "$SECRET" \
-    && ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext /tmp/g1billet/${UNIQID}.ipns.key) \
-    && rm -f /tmp/g1billet/${UNIQID}.ipns.key \
+    && ${MY_PATH}/keygen -t ipfs -o ${MY_PATH}/tmp/g1billet/${UNIQID}.ipns.key "$NUMBER" "$SECRET" \
+    && ASTRONAUTENS=$(ipfs key import ${UNIQID} -f pem-pkcs8-cleartext ${MY_PATH}/tmp/g1billet/${UNIQID}.ipns.key) \
+    && rm -f ${MY_PATH}/tmp/g1billet/${UNIQID}.ipns.key \
     && ipfs key rm ${UNIQID} > /dev/null &2>1 \
     && [[ $EMAIL ]] && curl -s "https://astroport.copylaradio.com/?salt=$NUMBER$pepper=$SECRET&g1pub=on&email=$EMAIL"
 
@@ -68,21 +68,21 @@ done
 
 if [[ "${STYLE}" == "ticket" || "${STYLE}" == "xbian"  || "${STYLE}" == "astro" ]]
 then
-    cp /tmp/g1billet/${UNIQID}/*.jpg /tmp/g1billet/${UNIQID}.jpg
+    cp ${MY_PATH}/tmp/g1billet/${UNIQID}/*.jpg ${MY_PATH}/tmp/g1billet/${UNIQID}.jpg
 
     # CLEANING TEMP FILES
-    rm -Rf /tmp/g1billet/${UNIQID}
+    rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID}
     # ALLOWS ANY USER TO DELETE
-    chmod 777 /tmp/g1billet/${UNIQID}.jpg
+    chmod 777 ${MY_PATH}/tmp/g1billet/${UNIQID}.jpg
 else
-    # MONTAGE DES IMAGES DES BILLETS VERS /tmp/g1billet/${UNIQID}.pdf
-    montage /tmp/g1billet/${UNIQID}/*.jpg -tile 2x3 -geometry 964x459 /tmp/g1billet/${UNIQID}.pdf
+    # MONTAGE DES IMAGES DES BILLETS VERS ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf
+    montage ${MY_PATH}/tmp/g1billet/${UNIQID}/*.jpg -tile 2x3 -geometry 964x459 ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf
     # NB!! if "not autorized" then edit /etc/ImageMagick-6/policy.xml and comment
     # <!-- <policy domain="coder" rights="none" pattern="PDF" /> -->
     # CLEANING TEMP FILES
-    rm -Rf /tmp/g1billet/${UNIQID}
+    rm -Rf ${MY_PATH}/tmp/g1billet/${UNIQID}
     # ALLOWS ANY USER TO DELETE
-    chmod 777 /tmp/g1billet/${UNIQID}.pdf
+    chmod 777 ${MY_PATH}/tmp/g1billet/${UNIQID}.pdf
 fi
 
 
diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh
index 6a3a979..cc3ad39 100755
--- a/MAKE_G1BILLET.sh
+++ b/MAKE_G1BILLET.sh
@@ -26,54 +26,54 @@ then
     exit 1
 fi
 
-mkdir -p /tmp/g1billet/$UNIQID
+mkdir -p ${MY_PATH}/tmp/g1billet/$UNIQID
 BILLETNAME=$(echo $NUMERO | sed 's/ /_/g')
 
 # Prepare June logo color
 case "$MONTANT" in
     1)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill grey -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill grey -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     2)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill green -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill green -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     5)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill orange -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill orange -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     10)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill blue -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill blue -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     20)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill purple -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill purple -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     50)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill red -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill red -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     100)
-        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill black -opaque '#e5912b' "/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/images/g1${STYLE}.png" -fuzz 20% -fill black -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     *)
-        cp "${MY_PATH}/images/g1${STYLE}.png" "/tmp/g1billet/${UNIQID}/g1.png"
+        cp "${MY_PATH}/images/g1${STYLE}.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
 esac
 
 
 # Add ${MY_PATH}/images/logo.png (250px)
-composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "${MY_PATH}/images/logo${STYLE}.png" "${MY_PATH}/images/fond${STYLE}.jpg" "/tmp/${BILLETNAME}.jpg"
+composite -compose Over -gravity SouthWest -geometry +50+50 -dissolve 70% "${MY_PATH}/images/logo${STYLE}.png" "${MY_PATH}/images/fond${STYLE}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 
 
 if [[ $ASTRONAUTENS ]]; then
     ## IT IS AN ASTRONAUTENS IPNS LINK
-    qrencode -s 6 -o "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
-    composite -compose Over -gravity SouthEast -geometry +200+45 "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
+    qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS"
+    composite -compose Over -gravity SouthEast -geometry +200+45 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 else
     # G1PUB QR CODE
-    qrencode -s 6 -o "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
-    composite -compose Over -gravity SouthEast -geometry +35+50 "/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
+    qrencode -s 6 -o "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "$NOTERIB"
+    composite -compose Over -gravity SouthEast -geometry +35+50 "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.QR.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 fi
 
 # Add June LOGO to Billet
-composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "/tmp/g1billet/${UNIQID}/g1.png" "/tmp/${BILLETNAME}.jpg" "/tmp/${BILLETNAME}.jpg"
+composite -compose Over -gravity NorthEast -geometry +50+25  -dissolve 90% "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png" "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 
 # xbian style (ASTROPORT/KODI) + JEU
 if [[ "${STYLE}" == "xbian" || "${STYLE}" == "jeu" || "${STYLE}" == "astro" ]]
@@ -95,7 +95,7 @@ convert -font 'Liberation-Sans' \
 -pointsize 30 -draw 'text 50,100 "'"Identifiant: $NUMERO"'"' \
 -pointsize 22 -fill black -draw 'text 50,130 "'"Code Secret:  $SECRET"'"' \
 -pointsize 25 -fill black -draw 'text 150,440 "'"$BOTTOM"'"' \
-"/tmp/${BILLETNAME}.jpg" "/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
+"${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 else
 convert -font 'Liberation-Sans' \
 -pointsize 40 -fill black -draw 'text 70,60 "'"$XZUID"'"' \
@@ -103,9 +103,9 @@ convert -font 'Liberation-Sans' \
 -pointsize 30 -draw 'text 50,100 "'"Secret 1: $NUMERO"'"' \
 -pointsize 30 -fill black -draw 'text 50,130 "'"Secret 2: $SECRET"'"' \
 -pointsize 25 -fill black -draw 'text 150,440 "'"$BOTTOM"'"' \
-"/tmp/${BILLETNAME}.jpg" "/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
+"${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg"
 fi
 
-rm -f /tmp/${BILLETNAME}.jpg
+rm -f ${MY_PATH}/tmp/${BILLETNAME}.jpg
 
 ## TODO STORE XZUID & G1PUB into ASTROPORT/IPFS, as FUTURE travelers...