Add find and remove conflicted Dropbox files alias

This commit is contained in:
Aaron Biggs 2016-09-13 08:11:33 -05:00 committed by GitHub
commit aaf79d6c1b

View file

@ -44,8 +44,11 @@ alias code='~/Dropbox/Code'
alias tunnel='sshuttle -D --pidfile=/tmp/sshuttle.pid -r abiggs@10.26.0.80 10.26.196.0/24' alias tunnel='sshuttle -D --pidfile=/tmp/sshuttle.pid -r abiggs@10.26.0.80 10.26.196.0/24'
alias stoptunnel='[[ -f /tmp/sshuttle.pid ]] && kill `cat /tmp/sshuttle.pid`' alias stoptunnel='[[ -f /tmp/sshuttle.pid ]] && kill `cat /tmp/sshuttle.pid`'
# Dropbox
alias dw='~/Dropbox' alias dw='~/Dropbox'
alias dp='~/Dropbox\ \(Personal\)' alias dp='~/Dropbox\ \(Personal\)'
alias dpfc='find . -type f -name "* conflicted *"'
alias dprc='find . -type f -name "* conflicted *" -exec rm -f {} \;'
# Docker Machine # Docker Machine
alias dminit="docker-machine create --driver virtualbox default" alias dminit="docker-machine create --driver virtualbox default"