From f57dbb553f4424f81d793140e43b2c8abc8b71d5 Mon Sep 17 00:00:00 2001 From: Roman Zeyde Date: Tue, 10 Oct 2017 13:20:25 +0300 Subject: [PATCH] gpg: allow setting trezor-gpg arguments via gpg-init script --- scripts/gpg-init | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/gpg-init b/scripts/gpg-init index 4d629a2..36029aa 100755 --- a/scripts/gpg-init +++ b/scripts/gpg-init @@ -2,6 +2,9 @@ set -eu USER_ID="${1}" +shift +ARGS="$*" + DEVICE=${DEVICE:="trezor"} # or "ledger" CURVE=${CURVE:="nist256p1"} # or "ed25519" TIMESTAMP=${TIMESTAMP:=`date +%s`} # key creation timestamp @@ -17,7 +20,7 @@ mkdir -p "${HOMEDIR}" chmod 700 "${HOMEDIR}" # Generate new GPG identity and import into GPG keyring -$DEVICE-gpg create -v "${USER_ID}" -t "${TIMESTAMP}" -e "${CURVE}" > "${HOMEDIR}/pubkey.asc" +$DEVICE-gpg create -v "${USER_ID}" -t "${TIMESTAMP}" -e "${CURVE}" ${ARGS} > "${HOMEDIR}/pubkey.asc" ${GPG_BINARY} --homedir "${HOMEDIR}" --import < "${HOMEDIR}/pubkey.asc" 2> /dev/null rm -f "${HOMEDIR}/S.gpg-agent" # (otherwise, our agent won't be started automatically)