public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Filipe Rosset <rosset.filipe@gmail.com>
To: git-commits@fedoraproject.org
Subject: [rpms/keychain] epel10.3: Fix keychain.csh for new 3.0.x series
Date: Sat, 29 Aug 2026 15:45:27 GMT [thread overview]
Message-ID: <178801832777.1.6904725831084896144.rpms-keychain-081627d6b831@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/keychain
Branch : epel10.3
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=epel10.3
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
reply other threads:[~2026-08-29 15:45 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178801832777.1.6904725831084896144.rpms-keychain-081627d6b831@fedoraproject.org \
--to=rosset.filipe@gmail.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox