forked from qo-op/G1BILLET
correct 6 per page G1BILLET mode
This commit is contained in:
parent
0cdf22c4e0
commit
17b06fe84d
15
G1BILLETS.sh
15
G1BILLETS.sh
|
@ -34,8 +34,6 @@ if [[ $MONTANT != "daemon" ]]; then
|
||||||
SECRET1="$4"
|
SECRET1="$4"
|
||||||
SECRET2="$5"
|
SECRET2="$5"
|
||||||
|
|
||||||
[[ $MONTANT != "___" ]] && DICE=3 ## Planche G1BILLET avec MONTANT securité 3
|
|
||||||
|
|
||||||
[[ $DICE != ?(-)+([0-9]) ]] && DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS
|
[[ $DICE != ?(-)+([0-9]) ]] && DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS
|
||||||
[[ $DICE != ?(-)+([0-9]) ]] && DICE=4
|
[[ $DICE != ?(-)+([0-9]) ]] && DICE=4
|
||||||
|
|
||||||
|
@ -73,13 +71,14 @@ if [[ $MONTANT != "daemon" ]]; then
|
||||||
boucle=0;
|
boucle=0;
|
||||||
while [ $boucle -lt $NBbillets ]
|
while [ $boucle -lt $NBbillets ]
|
||||||
do
|
do
|
||||||
boucle=$((boucle+1))
|
|
||||||
## THIS IS THE PASS for ZENCARD
|
## THIS IS THE PASS for ZENCARD
|
||||||
UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
|
if [[ ${boucle} == 0 ]]; then
|
||||||
[ $DICE -gt 4 ] && UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
|
UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5)
|
||||||
[ $DICE -gt 6 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${RANDOM}${RANDOM}" | tail -c-7)
|
[ $DICE -gt 4 ] && UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-7)
|
||||||
|
[ $DICE -gt 6 ] && UNIQID=$(${MY_PATH}/diceware.sh 1 | xargs)$(echo "${RANDOM}${RANDOM}" | tail -c-7)
|
||||||
mkdir -p "${MY_PATH}/tmp/g1billet/${UNIQID}"
|
mkdir -p "${MY_PATH}/tmp/g1billet/${UNIQID}"
|
||||||
|
fi
|
||||||
|
boucle=$((boucle+1))
|
||||||
|
|
||||||
## ADAPT SECURITY LEVEL
|
## ADAPT SECURITY LEVEL
|
||||||
[[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1="${UNIQID} $(${MY_PATH}/diceware.sh $DICE | xargs)"
|
[[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1="${UNIQID} $(${MY_PATH}/diceware.sh $DICE | xargs)"
|
||||||
|
|
|
@ -231,7 +231,7 @@ convert -font 'Liberation-Sans' \
|
||||||
else
|
else
|
||||||
convert -font 'Liberation-Sans' \
|
convert -font 'Liberation-Sans' \
|
||||||
-pointsize 35 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
|
-pointsize 35 -fill black -draw 'text 50,56 "'"$XZUID"'"' \
|
||||||
-pointsize 22 -fill black -draw 'text 340,26 "'"${NOTERIB}:ZEN"'"' \
|
-pointsize 22 -fill black -draw 'text 300,26 "'"${NOTERIB}:ZEN"'"' \
|
||||||
-pointsize 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \
|
-pointsize 22 -fill black -draw 'text 50,85 "'"(Secret 1) ${SECRET1}"'"' \
|
||||||
-pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \
|
-pointsize 22 -fill black -draw 'text 50,105 "'"(Secret 2) $SECRET2"'"' \
|
||||||
-pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \
|
-pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \
|
||||||
|
|
Loading…
Reference in New Issue