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

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

[Filipe Rosset]

            A new commit has been pushed.

            Repo   : rpms/keychain
            Branch : f45
            Commit : 081627d6b8315a1ea913ee5f4db4c4a980648c10
            Author : Filipe Rosset <rosset.filipe@gmail.com>
            Date   : 2026-08-29T12:40:20-03:00
            Stats  : +17/-16 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/keychain/c/081627d6b8315a1ea913ee5f4db4c4a980648c10?branch=f45

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

Resolves: rhbz#2521577

---
diff --git a/keychain.csh b/keychain.csh
index f937a7a..e2beb23 100755
--- a/keychain.csh
+++ b/keychain.csh
@@ -1,34 +1,35 @@
 # /etc/profile.d/keychain.csh - calling keychain the Fedora way
-# read in user's keychain settings or use defaults running keychain
+# run keychain; it reads ~/.keychainrc itself
 
-set userhome = `getent passwd $USER | cut -d: -f6`
-if ( "$HOME" == "$userhome" && -f "$HOME/.keychainrc" ) then
+# Don't do anything if we're already done.
+if ( $?KEYCHAIN_DONE ) exit
 
-    eval `grep -v '^[:blank:]*#' $HOME/.keychainrc | \
-	sed 's|\([^=]*\)=\([^=]*\)|set \1 = \2|g' | sed 's|$|;|'`
+set userhome = `getent passwd $USER | cut -d: -f6`
+if ( "$HOME" == "$userhome" ) then
 
     if (! $?KCHOPTS) then
-	set KCHOPTS = "--quiet"
+	set KCHOPTS = "--quiet --immediate"
     endif
     if (! $?prompt) then
 	set KCHOPTS = ( $KCHOPTS --noask )
     endif
-    if (! $?SSHKEYS) then
-	set SSHKEYS = `grep -s -l -e '[DRS]S[AH] PRIVATE KEY' $HOME/.ssh/*`
-    endif
-    if (! $?GPGKEYS) then
-	set GPGKEYS = ""
-    endif
+
+    set SSHKEYS = `grep -s -l -e '[DRS]S[AH] PRIVATE KEY' "$HOME"/.ssh/*`
+    set GPGKEYS = ""
 
     keychain $KCHOPTS $SSHKEYS $GPGKEYS
 
     set host = `uname -n`
-    if (-f $HOME/.keychain/$host-csh) then
-	source $HOME/.keychain/$host-csh
+    if (-f "$HOME/.keychain/$host-csh") then
+	source "$HOME/.keychain/$host-csh"
     endif
-    if (-f $HOME/.keychain/$host-csh-gpg) then
-	source $HOME/.keychain/$host-csh-gpg
+    if (-f "$HOME/.keychain/$host-csh-gpg") then
+	source "$HOME/.keychain/$host-csh-gpg"
     endif
 
+    unset KCHOPTS SSHKEYS GPGKEYS host
+
+    set KEYCHAIN_DONE = 1
 endif
 
+unset userhome