diff --git a/G1BILLETS.sh b/G1BILLETS.sh index c1c3da2..db5b676 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -48,8 +48,14 @@ do done -if [[ "${STYLE}" != "ticket" ]] +if [[ "${STYLE}" == "ticket" || "${STYLE}" == "xbian" ]] then + cp /tmp/g1billet/${UNIQID}/*.jpg /tmp/g1billet/${UNIQID}.jpg + # CLEANING TEMP FILES + rm -Rf /tmp/g1billet/${UNIQID} + # ALLOWS ANY USER TO DELETE + chmod 777 /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 # NB!! if "not autorized" then edit /etc/ImageMagick-6/policy.xml and comment @@ -58,12 +64,6 @@ then rm -Rf /tmp/g1billet/${UNIQID} # ALLOWS ANY USER TO DELETE chmod 777 /tmp/g1billet/${UNIQID}.pdf -else - cp /tmp/g1billet/${UNIQID}/*.jpg /tmp/g1billet/${UNIQID}.jpg - # CLEANING TEMP FILES - rm -Rf /tmp/g1billet/${UNIQID} - # ALLOWS ANY USER TO DELETE - chmod 777 /tmp/g1billet/${UNIQID}.jpg fi diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index da79d3f..7ebe289 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -76,7 +76,7 @@ then BOTTOM="ASTROPORT KODI --- https://gchange.fr ---" else XZUID="G1 BILLET" - BOTTOM="Porte Monnaie Libre!! https://gchange.fr https://cesium.app" + BOTTOM="Porte Monnaie Libre!! https://gchange.fr https://cesium.app" fi convert -font 'Liberation-Sans' \