Commits

MrTux Hdb committed ff2bb1a

Fix: ssh-agent and gpg-agent plugin failed on start

Comments (0)

Files changed (6)

bash/bash_profile

 #!/bin/bash
 # ~/.bash_profile
-# Last Modified: 24/01/2014 02:11 AM
+# Last Modified: 01/02/2014 02:45 AM
 
 _byobu_sourced=1 . /usr/bin/byobu-launch
 # Realtime ~/.bash_history
 export PROMPT_COMMAND="history -a; history -c; history -r; $PROMPT_COMMAND"
 
-# End of ~/.bashrc
+### Keychain ###
+# Let re-use ssh-agent and/or gpg-agent between logins
+eval $(keychain --eval -Q --quiet $HOME/.ssh/id_rsa)
+source $HOME/.keychain/$HOSTNAME-sh
+source $HOME/.keychain/$HOSTNAME-sh-gpg
+
+# Clear screen
+clear
+
+# End of ~/.bashrc
 ### virtualenv ###
 export WORKON_HOME=$HOME/.virtualenvs
 
+export HOSTNAME=`hostname`
+
 # Setup Input Method
 export XMODIFIERS=@im=scim
 export GTK_IM_MODULE=scim
     export LESS_TERMCAP_ue=$'\E[0m'          # end underline
     export LESS_TERMCAP_us=$'\E[01;32m'      # begin underline
 
-# End of ~/.shell_env
+# End of ~/.shell_env

shell/profile

-#!/bin/sh
-# ~/.profile
-# Last Modified: 24/01/2014 02:11 AM
-
-export HOSTNAME=`hostname`
-
-### START-Keychain ###
-# Let re-use ssh-agent and/or gpg-agent between logins
-eval keychain -Q --quiet $HOME/.ssh/id_rsa
-source $HOME/.keychain/$HOSTNAME-sh
-source $HOME/.keychain/$HOSTNAME-sh-gpg
-clear
-### END-Keychain ###
 #!/bin/zsh
 # ~/.zprofile
-# Last Modified: 24/01/2014 02:11 AM
+# Last Modified: 01/02/2014 02:45 AM
 
 _byobu_sourced=1 . /usr/bin/byobu-launch
 # Example format: plugins=(rails git textmate ruby lighthouse)
 plugins=( battery bundler colorize command-not-found common-aliases cp debian
           emoji-clock encode64 extract gem git git-extras git-flow
-          git-remote-branch github gitignore gpg-agent go heroku history
+          git-remote-branch github gitignore go heroku history
           history-substring-search mercurial mosh pip python rails rake rsync
           ruby rvm sbt scala screen sudo svn systemadmin
           tmux tmuxinator urltools virtualenv virtualenvwrapper vundle
 #     ls -a
 # }
 
+### Keychain ###
+# Let re-use ssh-agent and/or gpg-agent between logins
+eval $(keychain --eval -Q --quiet $HOME/.ssh/id_rsa)
+source $HOME/.keychain/$HOSTNAME-sh
+source $HOME/.keychain/$HOSTNAME-sh-gpg
+
 # automatically source zshrc in all open terminals
 trap "source ~/.zshrc && rehash" USR1
 
+# Clear screen
+clear
 # End of ~/.zshrc