[rpms/keychain] f45: Fix keychain.sh for new 3.0.x series

[rpms/keychain] f45: Fix keychain.sh for new 3.0.x series

[Filipe Rosset]

A new commit has been pushed.

Repo   : rpms/keychain
Branch : f45
Commit : 623cd29cf858231035d7a7c3bd1cdda32c0a5830
Author : Filipe Rosset <rosset.filipe@gmail.com>
Date   : 2026-08-29T12:35:15-03:00
Stats  : +8/-7 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/keychain/c/623cd29cf858231035d7a7c3bd1cdda32c0a5830?branch=f45

Log:
Fix keychain.sh for new 3.0.x series

---
diff --git a/keychain.sh b/keychain.sh
index 8b47cd2..7b468de 100755
--- a/keychain.sh
+++ b/keychain.sh
@@ -1,22 +1,23 @@
 #
 # /etc/profile.d/keychain.sh - calling keychain the Fedora way
-# read in user's keychain settings or use defaults running keychain
+# run keychain; it reads ~/.keychainrc itself
 
 # Don't do anything if we're already done.
 [ -n "$KEYCHAIN_DONE" ] && return
 
 userhome=$(getent passwd "$USER" | cut -d: -f6)
-if [ "$HOME" = "$userhome" ] && [ -f "$HOME/.keychainrc" ]; then
+if [ "$HOME" = "$userhome" ]; then
+
+    [ -n "$KCHOPTS" ] || KCHOPTS="--quiet --immediate"
 
-    . "$HOME/.keychainrc"
-    [ -n "$KCHOPTS" ] || KCHOPTS="--quiet"
     case $- in
         *i*) ;;
         *) KCHOPTS="$KCHOPTS --noask" ;;
     esac
-    [ -n "$SSHKEYS" ] || SSHKEYS=$(grep -s -l -e '[DRS]S[AH] PRIVATE KEY' \
-                                   $HOME/.ssh/*)
-    [ -n "$GPGKEYS" ] || GPGKEYS=""
+
+    SSHKEYS=$(grep -s -l -e '[DRS]S[AH] PRIVATE KEY' \
+                                   "$HOME"/.ssh/*)
+    GPGKEYS=""
 
     keychain $KCHOPTS $SSHKEYS $GPGKEYS