This commit is contained in:
Fergal Moran
2016-07-04 20:12:24 +01:00
parent 7f355f8c2b
commit 59abaed2fa
2 changed files with 28 additions and 1 deletions

View File

@@ -5,8 +5,10 @@ alias djshell="python manage.py shell_plus --use-pythonrc --ipython"
alias djdb="python manage.py dbshell" alias djdb="python manage.py dbshell"
alias djmigrate="python manage.py schemamigration spa --auto" alias djmigrate="python manage.py schemamigration spa --auto"
alias dss="cd ~/Dropbox/development/deepsouthsounds.com/dss.api && workon dss" alias dss="cd ~/Dropbox/development/deepsouthsounds.com/dss.api && workon dss.api"
alias dss_nuke_venv='deactivate || rm -rf ~/.virtualenvs/dss.api/ && mkvirtualenv dss.api -p python3 && pip install --upgrade pip && pip install -r requirements.txt'
alias dss_radio="cd ~/Dropbox/development/deepsouthsounds.com/dss.radio && workon dss.radio && docker start dssdocker_icecast_1" alias dss_radio="cd ~/Dropbox/development/deepsouthsounds.com/dss.radio && workon dss.radio && docker start dssdocker_icecast_1"
alias pgdo="sudo -u postgres" alias pgdo="sudo -u postgres"
alias sqlw="sqlw &" alias sqlw="sqlw &"
@@ -48,3 +50,5 @@ alias pskill=doPsKill
alias docker-nuke="docker rm -f $(docker ps -a -q) && docker rmi $(docker images -q)" alias docker-nuke="docker rm -f $(docker ps -a -q) && docker rmi $(docker images -q)"
alias dc='docker-compose' alias dc='docker-compose'
alias docker-rm-untagged='docker rmi -f $(docker images | grep "^<none>" | awk "{print $3}")'} alias docker-rm-untagged='docker rmi -f $(docker images | grep "^<none>" | awk "{print $3}")'}

View File

@@ -18,3 +18,26 @@ for f in $(command ls ~/.node-completion); do
f="$HOME/.node-completion/$f" f="$HOME/.node-completion/$f"
test -f "$f" && . "$f" test -f "$f" && . "$f"
done done
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