chawley/dotfiles-zsh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reverted SSH agent settings in rc, added some ls aliases

Browse Source
This commit is contained in:
Charles Hawley
2019-02-11 15:46:34 -05:00
parent 00010931e2
commit 9988fe1f58
2 changed files with 3 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.zsh_aliases
View File

@@ -19,6 +19,8 @@ alias la='ls -CFA' # l with . and ..
alias ll='ls -l' # long list alias ll='ls -l' # long list
alias lla='ls -al' # ll with . and .. alias lla='ls -al' # ll with . and ..
alias ls='ls -hF --color=tty' # classify files in colour alias ls='ls -hF --color=tty' # classify files in colour
alias lls='ls -lh --sort=size --reverse'
alias llt='ls -l -t -r'
# Extras # Extras
alias ping='ping -c 5' # Stop pinging after 5 pings alias ping='ping -c 5' # Stop pinging after 5 pings

24
.zshrc
View File

@@ -119,27 +119,3 @@ source $HOME/.zsh_functions
# set PATH so it includes user's private bin if it exists # set PATH so it includes user's private bin if it exists
PATH="$HOME/.local/bin:$HOME/bin:$PATH" PATH="$HOME/.local/bin:$HOME/bin:$PATH"
# initialize and load SSH-AGENT
# https://stackoverflow.com/a/18915067
SSH_ENV="$HOME/.ssh/environment"
function start_agent {
echo "Initialising new SSH agent..."
/usr/bin/ssh-agent | sed 's/^echo/#echo/' > "${SSH_ENV}"
echo succeeded
chmod 600 "${SSH_ENV}"
. "${SSH_ENV}" > /dev/null
/usr/bin/ssh-add;
}
# Source SSH settings, if applicable
if [ -f "${SSH_ENV}" ]; then
. "${SSH_ENV}" > /dev/null
#ps ${SSH_AGENT_PID} doesn't work under cywgin
ps -ef | grep ${SSH_AGENT_PID} | grep ssh-agent$ > /dev/null || {
start_agent;
}
else
start_agent;
fi