balkian/dotfiles
1
0
Fork 0
mirror of https://github.com/balkian/dotfiles.git synced 2024-11-24 21:22:29 +00:00
Code Issues Releases Wiki Activity

Added SSH_AUTH_SOCKET fix

Browse Source
This commit is contained in:
J.Fernando Sánchez 2013-03-26 02:57:43 +01:00
parent 115a9e3118
commit 70de8170b0
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bashrc
View File

@ -1,3 +1,4 @@
source ~/.starttmux
# If not running interactively, don't do anything # If not running interactively, don't do anything
[ -z "$PS1" ] && return [ -z "$PS1" ] && return
@ -174,16 +175,6 @@ PS0="$PS0 \\[\033[1;32m\]\$(parse_git_branch)\\[\033[0m\]\$ "
export PATH=$PATH:"/media/Data/code/personal-scripts/" export PATH=$PATH:"/media/Data/code/personal-scripts/"
export CDPATH=$CDPATH:"/media/Data/" export CDPATH=$CDPATH:"/media/Data/"
# TMUX
if which tmux 2>&1 >/dev/null; then
# if no session is started, start a new session
test -z ${TMUX} && tmux attach
# when quitting tmux, try to attach
if test -z ${TMUX}; then
exit;
fi
fi
PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting PATH=$PATH:$HOME/.rvm/bin # Add RVM to PATH for scripting
### Added by the Heroku Toolbelt ### Added by the Heroku Toolbelt

2
oh-my-zsh

@ -1 +1 @@
Subproject commit 2c3489a75014f80c87ee6c6ae6ab62251dd684b0 Subproject commit 9de171c0217bf9a50b9a091d56a13cf27b1fbb82

16
starttmux Normal file
View File

@ -0,0 +1,16 @@
# TMUX
# if [[ -z "$KONSOLE_DBUS_SERVICE" & `which tmux` ]]; then
# if no session is started, start a new session
if [[ -n $(which tmux) ]]; then
stty -ixon
if [ ! -z "$SSH_AUTH_SOCK" -a "$SSH_AUTH_SOCK" != "$HOME/.ssh/ssh_auth_sock" ] ; then
unlink "$HOME/.ssh/ssh_auth_sock" 2>/dev/null
ln -s "$SSH_AUTH_SOCK" "$HOME/.ssh/ssh_auth_sock"
export SSH_AUTH_SOCK="$HOME/.ssh/ssh_auth_sock"
fi
test -z ${TMUX} && tmux attach
# when quitting tmux, try to attach
if [[ -z ${TMUX} ]]; then
exit;
fi
fi

12
zshrc
View File

@ -1,3 +1,4 @@
source ~/.starttmux
# Path to your oh-my-zsh configuration. # Path to your oh-my-zsh configuration.
ZSH=$HOME/.oh-my-zsh ZSH=$HOME/.oh-my-zsh
@ -44,17 +45,6 @@ export PATH=/usr/lib/lightdm/lightdm:/usr/local/sbin:/usr/local/bin:/usr/sbin:/u
PYTHONSTARTUP=~/.pythonrc.py PYTHONSTARTUP=~/.pythonrc.py
export PYTHONSTARTUP export PYTHONSTARTUP
# TMUX
# if [[ -z "$KONSOLE_DBUS_SERVICE" & `which tmux` ]]; then
# if no session is started, start a new session
if [[ -z "$KONSOLE_DBUS_SERVICE" && -n $(which tmux) ]]; then
stty -ixon
test -z ${TMUX} && tmux attach
# when quitting tmux, try to attach
if [[ -z ${TMUX} ]]; then
exit;
fi
fi
### Added by the Heroku Toolbelt ### Added by the Heroku Toolbelt
export PATH="/usr/local/heroku/bin:$PATH" export PATH="/usr/local/heroku/bin:$PATH"