From d7abc68dbf456203cfa06fa47058784f99c181af Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Wed, 18 Aug 2010 14:01:45 +0200 Subject: [Gpg] allows gpg-agent to be accessible from ~/.zshrc.. --- 10_Environment.zsh | 3 --- 12_Prompts.zsh | 3 --- zshrc | 6 ++++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/10_Environment.zsh b/10_Environment.zsh index e2d7a62..99b0d19 100644 --- a/10_Environment.zsh +++ b/10_Environment.zsh @@ -18,9 +18,6 @@ export SHELL=`which zsh` -## Agent de clefs SSH/GPG -KEYCHAIN=~/.keychain/$(hostname)-sh - ## Colors autoload colors && colors diff --git a/12_Prompts.zsh b/12_Prompts.zsh index 0462fac..0819595 100644 --- a/12_Prompts.zsh +++ b/12_Prompts.zsh @@ -108,9 +108,6 @@ update_prompt_elements() [ "$DEBUG" = "yes" ] && echo -n " Agents..." # GPG/SSH agents AGENTS="" - [ -r "${KEYCHAIN}" ] && source ${KEYCHAIN} - [ -r "${KEYCHAIN}-gpg" ] && source ${KEYCHAIN}-gpg - local _is_multibyte_compliant if ( echo ${(k)options} | grep "multibyte" >/dev/null ) && [ "$options[multibyte]" = "on" ] diff --git a/zshrc b/zshrc index 3373e51..561cf66 100644 --- a/zshrc +++ b/zshrc @@ -39,6 +39,12 @@ DOMAIN=${DOMAIN:-$(hostname -d 2>&-)} DOMAIN=${DOMAIN:-$(hostname -y 2>&-)} [ "$DOMAIN" = "" -o "$DOMAIN" = "localdomain" -o "$DOMAIN" = "(none)" ] && DOMAIN=$(grep "^search " /etc/resolv.conf | cut -d' ' -f2) +## Agent de clefs SSH/GPG +KEYCHAIN=~/.keychain/$(hostname)-sh +[ -r "${KEYCHAIN}" ] && source ${KEYCHAIN} +[ -r "${KEYCHAIN}-gpg" ] && source ${KEYCHAIN}-gpg + + DEBUG=${DEBUG:-no} export USER HOST DOMAIN UID -- cgit v1.2.3 From 9d3f638cdc90e6db89ea0306ff836527b19171e0 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Wed, 18 Aug 2010 14:29:01 +0200 Subject: [Gpg] quiet mode --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 561cf66..acb5ca0 100644 --- a/zshrc +++ b/zshrc @@ -88,7 +88,7 @@ if [ -d $ZDOTDIR ]; then if test -f $specific_script.gpg then [ "$DEBUG" = "yes" ] && echo -n "$i/${${specific_script:t:r}/??_/} [CRYPTED]... "; - eval $(gpg --decrypt $specific_script.gpg) + eval $(gpg --quiet --decrypt $specific_script.gpg) [ "$DEBUG" = "yes" ] && echo fi done -- cgit v1.2.3 From 0a8cdd4cc006e0241c887da10132853f167d4384 Mon Sep 17 00:00:00 2001 From: Hugues Hiegel Date: Wed, 18 Aug 2010 22:19:08 +0200 Subject: [Env] removed fucking GPG env startup file --- net:sweethome/Environment.zsh.gpg | Bin 393 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 net:sweethome/Environment.zsh.gpg diff --git a/net:sweethome/Environment.zsh.gpg b/net:sweethome/Environment.zsh.gpg deleted file mode 100644 index 3c2cdc1..0000000 Binary files a/net:sweethome/Environment.zsh.gpg and /dev/null differ -- cgit v1.2.3