Auto commit by The Sugar System.

[sugar.git] / dot-files / _zshrc

diff --git a/dot-files/_zshrc b/dot-files/_zshrc
index 60ac6167201e1ddd580dff31d11cf5443c81a0ff..acd4fb107b18c3bf913151bcbad6c8e2a83162ed 100644 (file)
--- a/dot-files/_zshrc
+++ b/dot-files/_zshrc
@@ -298,6 +298,9 @@ elif [[ $(hostname) = "yukari.cielonegro.org" ]]; then
         done
         ssh kurumi open -a Firefox ${args[@]}
     }
+    function mdock () {
+        ssh kurumi open -a Dock
+    }
 fi
 
 if [[ $(uname) = "Darwin" ]]; then
@@ -339,6 +342,27 @@ function osname () {
     esac
 }
 
+function _start_gpg_agent () {
+    if ! which gpg-agent >&/dev/null; then
+        # gpg-agent is not present.
+        return
+    fi
+
+    if gpg-connect-agent /bye >&/dev/null; then
+        # gpg-agent is already running.
+        if [[ -f "${HOME}/.gpg-agent-info" ]]; then
+            . "${HOME}/.gpg-agent-info"
+            export GPG_AGENT_INFO
+        fi
+    else
+        # gpg-agent is not running yet.
+        eval $(gpg-agent --daemon --write-env-file "${HOME}/.gpg-agent-info")
+    fi
+
+    GPG_TTY=$(tty)
+    export GPG_TTY
+}
+
 if _we_are_in_gnu_screen; then
     # When we are in a GNU Screen session...
 
@@ -361,3 +385,5 @@ fi
 if which ssh-agent-manager >/dev/null 2>&1; then
     eval `ssh-agent-manager -s`
 fi
+
+_start_gpg_agent