Activate own styles in "./_images/_"

.gitignore

@@ -1,4 +1,5 @@
 .env
 *.pyc
 tmp/
+_images/
 DICE

G1BILLETS.sh

@@ -8,6 +8,12 @@ MY_PATH="`dirname \"$0\"`"              # relative
 MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
 ME="${0##*/}"
 
+## LOAD PERSONAL OR DEFAULT STYLES
+[[ -d ${MY_PATH}/_images/_/ ]] \
+&& IMAGES="_images" \
+|| IMAGES="images"
+echo "USING ${IMAGES} STYLES"
+
 ################################################################################
 # Create different king of G1BILLET(s) with $MONTANT DU or TW IPNS + G1PASS
 # ${MY_PATH}/G1BILLETS.sh 5 ticket 2 # MONTANT # STYLE # SECURITE
@@ -43,13 +49,13 @@ if [[ $MONTANT != "daemon" ]]; then
 
     echo "CREATION $NBbillets x G1BILLET - $STYLE - "
 
-    ## DEFAULT STYLE FOLDER IS ${MY_PATH}/images/_
+    ## DEFAULT STYLE FOLDER IS ${MY_PATH}/${IMAGES}/_
     [[ ${STYLE} == "" ]] &&  STYLE="_"
 
     # CHECK IF $STYLE IMAGES EXIST
-    [[ ! -f ${MY_PATH}/images/${STYLE}/g1.png ]] && ERROR="STYLE INCONNU ./images/${STYLE}/g1.png" && echo $ERROR && exit 1
+    [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/g1.png ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/g1.png" && echo $ERROR && exit 1
-    [[ ! -f ${MY_PATH}/images/${STYLE}/fond.jpg ]] && ERROR="STYLE INCONNU ./images/${STYLE}/fond.jpg" && echo $ERROR && exit 1
+    [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/fond.jpg" && echo $ERROR && exit 1
-    [[ ! -f ${MY_PATH}/images/${STYLE}/logo.png ]] && ERROR="STYLE INCONNU ./images/${STYLE}/logo.png" && echo $ERROR && exit 1
+    [[ ! -f ${MY_PATH}/${IMAGES}/${STYLE}/logo.png ]] && ERROR="STYLE INCONNU ./${IMAGES}/${STYLE}/logo.png" && echo $ERROR && exit 1
 
     ## THIS IS THE PASS for G1PASS
     UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
@@ -152,7 +158,7 @@ else
     RNAME="$HNAME:33102"
 
     ## AVAILABLE STYLES
-    sytle=($(find ${MY_PATH}/images/* -type d | sort | rev | cut -d '/' -f 1 | rev))
+    sytle=($(find ${MY_PATH}/${IMAGES}/* -type d | sort | rev | cut -d '/' -f 1 | rev))
     sytlenb=${#sytle[@]}
     OPT=""
     for stname in ${sytle[@]}; do

MAKE_G1BILLET.sh

@@ -13,6 +13,13 @@ ME="${0##*/}"
 # ${MY_PATH}/G1BILLET_MAKE.sh "nu me ro test" "se cr et" 100 7sn9dKeCNEsHmqm1gMWNREke4YAWtNw8KG1YBSN8CmSh 97968583
 ############################################################################
 
+## LOAD PERSONAL OR DEFAULT STYLES
+[[ -d ${MY_PATH}/_images/_/ ]] \
+&& IMAGES="_images" \
+|| IMAGES="images"
+echo "USING ${IMAGES} STYLES"
+
+
 SALT="$1"
 SECRET="$2"
 MONTANT="$3"
@@ -35,36 +42,35 @@ BILLETNAME=$(echo $SALT | sed 's/ /_/g')
 # Prepare June logo color
 case "$MONTANT" in
     1)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill grey -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     2)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill green -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill green -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     5)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill orange -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     10)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill blue -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     20)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill purple -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     50)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill red -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill red -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     100)
-        convert "${MY_PATH}/images/${STYLE}/g1.png" -fuzz 20% -fill black -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        convert "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" -fuzz 20% -fill black -opaque '#e5912b' "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
     *)
-        cp "${MY_PATH}/images/${STYLE}/g1.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
+        cp "${MY_PATH}/${IMAGES}/${STYLE}/g1.png" "${MY_PATH}/tmp/g1billet/${UNIQID}/g1.png"
         ;;
 esac
 
-
+# Add LOGO over FOND
-# Add ${MY_PATH}/images/logo.png (250px)
 composite -compose Over -gravity SouthWest -geometry +150+50 -dissolve 70% \
-"${MY_PATH}/images/${STYLE}/logo.png" \
+"${MY_PATH}/${IMAGES}/${STYLE}/logo.png" \
-"${MY_PATH}/images/${STYLE}/fond.jpg" \
+"${MY_PATH}/${IMAGES}/${STYLE}/fond.jpg" \
 "${MY_PATH}/tmp/${BILLETNAME}.jpg"
 
 # "G1PASS" (GPG+TW) STYLE : xbian, xjeu, xastro
@@ -88,7 +94,7 @@ then
         DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-'  | tr '+' '_' | jq -Rr @uri )"
         echo "$DISCO"
         ## Add logo to QRCode
-        cp ${MY_PATH}/images/astrologo_nb.png ${MY_PATH}/tmp/fond.png
+        cp ${MY_PATH}/${IMAGES}/astrologo_nb.png ${MY_PATH}/tmp/fond.png
 
         ## MAKE amzqr WITH astro:// LINK
         amzqr -d ${MY_PATH}/tmp \
@@ -108,7 +114,7 @@ then
         rm ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc
 
         if [[ ${STYLE} == "xbian" ]]; then
-            amzqr "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" -l H -p "$MY_PATH/images/moa_net.png" -c -n QRTWavatar.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/
+            amzqr "https://ipfs.copylaradio.com/ipns/$ASTRONAUTENS" -l H -p "$MY_PATH/${IMAGES}/moa_net.png" -c -n QRTWavatar.png -d ${MY_PATH}/tmp/g1billet/${UNIQID}/
             convert ${MY_PATH}/tmp/g1billet/${UNIQID}/QRTWavatar.png -resize 260 ${MY_PATH}/tmp/g1billet/${UNIQID}/300.png
             composite -compose Over -gravity Center -geometry +40+40 \
             "${MY_PATH}/tmp/g1billet/${UNIQID}/300.png" \

README.md

@@ -57,17 +57,15 @@ sudo apt install git
 Utiliser le mode G1BILLET (seulement).
 
 ```
-## INSTALL
-## amzqr makes nicer QRCODE
-sudo python3 -m pip install -U amzqr
-
 # INSTALL G1BILLET SERVICE : http://g1billet.localhost:33101"
 mkdir -p ~/.zen/G1BILLET
 
 if [[ ! -d ~/.zen/G1BILLET ]]; then
     cd ~/.zen
     git clone https://git.p2p.legal/qo-op/G1BILLET.git
-    cd G1BILLET && ./setup_systemd.sh
+    cd G1BILLET
+    ./install.sh
+    ./setup_systemd.sh
     cd -
 fi