diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 00cedfe..410184c 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -34,8 +34,6 @@ if [[ $MONTANT != "daemon" ]]; then SECRET1="$4" 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=4 @@ -73,13 +71,14 @@ if [[ $MONTANT != "daemon" ]]; then boucle=0; while [ $boucle -lt $NBbillets ] do - boucle=$((boucle+1)) ## THIS IS THE PASS for ZENCARD - UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5) - [ $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}" + if [[ ${boucle} == 0 ]]; then + UNIQID=$(echo "${RANDOM}${RANDOM}${RANDOM}${RANDOM}" | tail -c-5) + [ $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}" + fi + boucle=$((boucle+1)) ## ADAPT SECURITY LEVEL [[ ${SECRET1} == "" || $boucle -gt 1 ]] && SECRET1="${UNIQID} $(${MY_PATH}/diceware.sh $DICE | xargs)" diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index e8caddd..87d1bcc 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -231,7 +231,7 @@ convert -font 'Liberation-Sans' \ else convert -font 'Liberation-Sans' \ -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,105 "'"(Secret 2) $SECRET2"'"' \ -pointsize 25 -fill grey -draw 'text 50,440 "'"$BOTTOM"'"' \