diff --git a/G1BILLETS.sh b/G1BILLETS.sh index e995f84..caf11e5 100755 --- a/G1BILLETS.sh +++ b/G1BILLETS.sh @@ -176,6 +176,27 @@ function countdown() { } } +
+
+ + + + +
+ +
' function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; } diff --git a/MAKE_G1BILLET.sh b/MAKE_G1BILLET.sh index 2d16f0a..d7279ad 100755 --- a/MAKE_G1BILLET.sh +++ b/MAKE_G1BILLET.sh @@ -80,8 +80,8 @@ then ## SECURED RANDOM salt : pepper GPG SEQUENCE s=$(${MY_PATH}/diceware.sh 1 | xargs) p=$(${MY_PATH}/diceware.sh 1 | xargs) - echo "/?${s}=${USALT}&${p}=${UPEPPER}" \ - | gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc + echo "/?${s}=${USALT}&${p}=${UPEPPER}" > ~/.zen/tmp/topgp + cat ~/.zen/tmp/topgp | gpg --symmetric --armor --batch --passphrase "$UNIQID" -o ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc DISCO="$(cat ${MY_PATH}/tmp/gpg.${BILLETNAME}.asc | tr '-' '~' | tr '\n' '-' | tr '+' '_' | jq -Rr @uri )" echo "$DISCO"