From 8fc624bcf81b96de8d1a8b2bb9ba10fb65930232 Mon Sep 17 00:00:00 2001 From: Shawn Borton Date: Mon, 12 Mar 2018 22:35:06 -0500 Subject: [PATCH] Path updates, Git aliases, and removing job specific items. --- .bash_profile | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/.bash_profile b/.bash_profile index 423d9cc..de7b8da 100644 --- a/.bash_profile +++ b/.bash_profile @@ -2,30 +2,36 @@ alias sites='cd /Users/shawnborton/Sites' alias Sites='cd /Users/shawnborton/Sites' alias kboxsites='cd /Users/shawnborton/Kalabox' -alias axwaysrcdir='cd docroot/sites/all/themes/axway/assets/src' alias ..="cd .." alias ...="cd ../.." alias h="cd ~" alias back="cd -" alias finder='open -a 'Finder' .' alias ll='ls -l' +alias lla='ls -la' # FOR CHROME alias chrome='open -a "Google Chrome"' +alias chrome-remote='/Applications/Google\ Chrome.app/Contents/MacOS/Google\ Chrome --remote-debugging-port=9222' # PHP alias php56='/Applications/XAMPP/bin/php' +alias php7='$(brew --prefix homebrew/php/php71)/bin/php' alias drucc='drush cc' alias drucca='drush cc all' -alias drupal='$(brew --prefix homebrew/php/php71)/bin/php /usr/local/bin/drupal' +#alias drupal='$(brew --prefix homebrew/php/php71)/bin/php /usr/local/bin/drupal' alias update-global-composer='cd ~/.composer && composer update' alias composer-update-global='update-global-composer' +alias d8check='composer update --dry-run' +alias termcc="terminus env:clear-cache" # PATH SHENANIGANS export XAMPP_PHP=/Applications/XAMPP/bin export DRUSH_PHP='/Applications/XAMPP/bin/php' +#export DRUSH_PHP='/usr/local/bin/php' #export PATH=$PATH:$XAMPP_PHP:./node_modules/.bin:$HOME/.composer/vendor/bin -export PATH=$XAMPP_PHP:$(brew --prefix homebrew/php/php71)/bin:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin +#export PATH=$XAMPP_PHP:$(brew --prefix homebrew/php/php71)/bin:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin +export PATH=$(brew --prefix homebrew/php/php71)/bin:$PATH:$XAMPP_PHP:./node_modules/.bin:$HOME/.composer/vendor/bin #export PATH=$XAMPP_PHP:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin #export PATH=$XAMPP_PHP:/usr/local/bin:$PATH:./node_modules/.bin:$HOME/.composer/vendor/bin source "$HOME/.console/console.rc" 2>/dev/null @@ -39,6 +45,8 @@ alias ga='git add' alias gb='git branch' alias gs='git status' alias kga='kbox git add' +alias gpshom='git push origin master' +alias gpllom='git pull origin master' alias kgb='kbox git branch' alias kgs='kbox git status' @@ -48,6 +56,11 @@ alias dotconfig='/usr/bin/git --git-dir=$HOME/.myconf/ --work-tree=$HOME' export NVM_DIR="/Users/shawnborton/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # This loads nvm +# include .job_aliases if it exists +if [ -f $HOME/.job_aliases ]; then + . $HOME/.job_aliases +fi + parse_git_branch() { git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/ (\1)/' }