Merge branch 'master' into master

This commit is contained in:
Anton Bolshakov 2025-09-29 04:38:53 +08:00 committed by GitHub
commit d6b9dbd894
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 7 deletions

View file

@ -143,12 +143,18 @@ if [ "${USER}" != "root" ]; then
# https://github.com/drduh/YubiKey-Guide?tab=readme-ov-file#notes
## This doesn't work but it should?
# running "scd serialno" "learn --force" once on a new system finds the first card, but running again doesn't successfully change the card
#if [ "${card}" = "green" ] && ! gpg-connect-agent 'keyinfo --list' /bye | grep -q 'D2760001240100000006204897290000'; then
# gpg-connect-agent killagent /bye
# gpg-connect-agent "scd serialno" "learn --force" /bye
#elif [ "${card}" = "red" ] && ! gpg-connect-agent 'keyinfo --list' /bye | grep -q 'D2760001240100000006204897280000'; then
# gpg-connect-agent killagent /bye
# gpg-connect-agent "scd serialno" "learn --force" /bye
#fi
if [ "${card}" = "green" ] && ! gpg-connect-agent 'keyinfo --list' /bye | grep -q 'D2760001240100000006204897290000'; then
gpg-connect-agent killagent /bye
gpg-connect-agent "scd serialno" "learn --force" /bye
elif [ "${card}" = "red" ] && ! gpg-connect-agent 'keyinfo --list' /bye | grep -q 'D2760001240100000006204897280000'; then
gpg-connect-agent killagent /bye
gpg-connect-agent "scd serialno" "learn --force" /bye
fi
#gpg --card-edit
#fetch
#quit
#gpg --edit-key A5DD1427DD11F94A
#trust
#quit
GPG_TTY=$(tty)
fi

View file

@ -55,6 +55,7 @@ RDEPEND="
dev-ruby/pry
dev-util/checkbashisms
dev-util/debugedit
dev-util/github-cli
dev-util/libabigail
dev-util/meld
dev-util/pkgcheck