Skip to content

Commit

Permalink
[Fix sorin-ionescu#419] Rewrite module gpg-agent; rename it to gpg
Browse files Browse the repository at this point in the history
  • Loading branch information
sorin-ionescu authored and linuslundahl committed Oct 17, 2013
1 parent a5808e3 commit cfd9cc4
Show file tree
Hide file tree
Showing 6 changed files with 49 additions and 80 deletions.
4 changes: 2 additions & 2 deletions modules/README.md
Expand Up @@ -46,10 +46,10 @@ GNU Utility

Provides for the interactive use of GNU utilities on non-GNU systems.

GPG-Agent
GPG
---------

Provides for an easier use of gpg-agent.
Provides for an easier use of GPG by setting up gpg-agent.

Haskell
-------
Expand Down
25 changes: 0 additions & 25 deletions modules/gpg-agent/README.md

This file was deleted.

46 changes: 0 additions & 46 deletions modules/gpg-agent/init.zsh

This file was deleted.

16 changes: 16 additions & 0 deletions modules/gpg/README.md
@@ -0,0 +1,16 @@
GPG
===

Provides for an easier use of [GPG][1] by setting up [gpg-agent][2].

Authors
-------

*The authors of this module should be contacted via the [issue tracker][3].*

- [Sorin Ionescu](https://github.com/sorin-ionescu)

[1]: http://www.gnupg.org
[2]: http://linux.die.net/man/1/gpg-agent
[3]: https://github.com/sorin-ionescu/prezto/issues

31 changes: 31 additions & 0 deletions modules/gpg/init.zsh
@@ -0,0 +1,31 @@
#
# Provides for an easier use of GPG by setting up gpg-agent.
#
# Authors:
# Sorin Ionescu <sorin.ionescu@gmail.com>
#

# Return if requirements are not found.
if (( ! $+commands[gpg-agent] )); then
return 1
fi

# Set the default path to the gpg-agent-info file.
_gpg_agent_info="$HOME/.gpg-agent-info"

# Start gpg-agent if not started.
ps -U "$USER" -o ucomm | grep -q gpg-agent \
|| gpg-agent --daemon >! "$_gpg_agent_info"

# Export environment variables.
export GPG_TTY="$(tty)"
source "$_gpg_agent_info"

# Clean up.
unset _gpg_agent_info

# Disable GUI prompts inside SSH.
if [[ -n "$SSH_CONNECTION" ]]; then
export PINENTRY_USER_DATA='USE_CURSES=1'
fi

7 changes: 0 additions & 7 deletions runcoms/zpreztorc
Expand Up @@ -99,13 +99,6 @@ zstyle ':prezto:module:prompt' theme 'anders'
# Auto start a session when Zsh is launched.
# zstyle ':prezto:module:screen' auto-start 'yes'

#
# GPG-Agent
#

# Enable SSH-Agent protocol emulation.
# zstyle ':prezto:module:gpg-agent' ssh-support 'yes'

#
# SSH-Agent
#
Expand Down

0 comments on commit cfd9cc4

Please sign in to comment.