diff --git a/G1BILLETS.sh b/G1BILLETS.sh index 853aa16..9880ed5 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -23,12 +23,12 @@ if [[ $MONTANT != "daemon" ]]; then STYLE="$2" DICE=$(cat $MY_PATH/DICE 2>/dev/null) ## HOW MANY WORDS SECRETS -[[ $DICE != ?(-)+([0-9]) ]] && DICE=2 +[[ $DICE != ?(-)+([0-9]) ]] && DICE=3 echo "$DICE WORDS SECRETS (Define length in $MY_PATH/DICE)" ## CHECK IF STYLE IS EMAIL => astro IPFS G1BILLET if [[ "${STYLE}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then - echo "ASTROPORT NEW PLAYER" + echo "ASTROPORT PLAYER DERIVATE KEY" # echo "PLAYER : $STYLE" EMAIL=${STYLE} STYLE="astro" @@ -56,6 +56,8 @@ do ## ADAPT SECURITY LEVEL SALT=$(${MY_PATH}/diceware.sh $DICE | xargs) + [[ $EMAIL != "" ]] && SALT=$EMAIL + SECRET=$(${MY_PATH}/diceware.sh $DICE | xargs) # CREATION CLEF BILLET @@ -108,7 +110,7 @@ fi UN=$(echo ${SALT} | jq -Rr @uri) ## URL ENCODED DE=$(echo ${SECRET} | jq -Rr @uri) ## URL ENCODED - echo curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL + echo 'curl -s https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL # && curl -s 'https://astroport.copylaradio.com/?salt='$UN'&pepper='$DE'&g1pub=on&email='$EMAIL fi diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 3606ac7..bfc2e65 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -21,8 +21,7 @@ UNIQID="$5" STYLE="$6" ## ASTRO TW MODE ASTRONAUTENS="$7" -EMAIL="$8" -[[ ! $EMAIL ]] && EMAIL="________@____________" +EMAIL="________@____________" if [[ "$SALT" == "" || "$SECRET" == "" || "$MONTANT" == "" || "$NOTERIB" == "" || "$UNIQID" == "" ]] then