diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 38bd27b..6e1acc1 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -22,7 +22,6 @@ STYLE="$6" ## ASTRO TW MODE ASTRONAUTENS="$7" EMAIL="$8" -[[ $EMAIL == "" ]] && EMAIL="________@____________" if [[ "$SALT" == "" || "$SECRET" == "" || "$MONTANT" == "" || "$NOTERIB" == "" || "$UNIQID" == "" ]] then @@ -105,7 +104,7 @@ then fi # ENTETE ET BAS DE BILLET - XZUID="$EMAIL" + XZUID="________@____________" BOTTOM="$(date) :: $(hostname) :: ♥Box ::" else @@ -144,8 +143,8 @@ else convert -font 'Liberation-Sans' \ -pointsize 40 -fill black -draw 'text 50,60 "'"$XZUID"'"' \ -pointsize 20 -fill black -draw 'text 380,26 "'"${NOTERIB}"'"' \ --pointsize 30 -draw 'text 50,100 "'"Secret 1: $SALT"'"' \ --pointsize 30 -fill black -draw 'text 50,130 "'"Secret 2: $SECRET"'"' \ +-pointsize 30 -draw 'text 50,90 "'"Secret 1: $SALT"'"' \ +-pointsize 30 -fill black -draw 'text 50,120 "'"Secret 2: $SECRET"'"' \ -pointsize 25 -fill white -draw 'text 50,440 "'"$BOTTOM"'"' \ "${MY_PATH}/tmp/${BILLETNAME}.jpg" "${MY_PATH}/tmp/g1billet/${UNIQID}/${BILLETNAME}.BILLET.jpg" fi