Merge branch 'master' of github.com:paulirish/dotfiles

.gitconfig

@@ -1,7 +1,6 @@
 [alias]
 	c = commit -am
-	up = pull
-	p = push
+	fpush = push --force
 	s = status
 	sclone = clone --depth=1
 	amend = commit --amend --all
@@ -14,7 +13,6 @@
 	d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
 
 	reup = rebase-update # depot_tools specific
-	fpush = push --force
 
 [core]
 	excludesfile = ~/.gitignore

fish/path.fish

@@ -22,15 +22,30 @@ end
 # 	set PA $PA /Users/paulirish/.rvm/gems/ruby-2.2.1/bin
 # end
 
+
+set -l paths "
 # yarn binary
-set PA $PA "$HOME/.yarn/bin"
+$HOME/.yarn/bin
 
 # yarn global modules (hack for me)
-set PA $PA "$HOME/.homebrew/Cellar/node/7.10.0/bin"
-set PA $PA "$HOME/.homebrew/Cellar/node/7.7.1_1/bin"
+$HOME/.homebrew/Cellar/node/7.10.0/bin
+$HOME/.homebrew/Cellar/node/7.7.1_1/bin
+$HOME/.homebrew/Cellar/node/7.7.4/bin
+$HOME/.homebrew/Cellar/node/8.0.0_1/bin
+"
+
+for entry in (string split \n $paths)
+    # resolve the {$HOME} substitutions
+    set -l resolved_path (eval echo $entry)
+    if test -d "$resolved_path";
+        set PA $PA "$resolved_path"
+    end
+end
 
-# Google Cloud SDK.
-[ -f "$HOME/google-cloud-sdk/path.fish.inc" ]; . "$HOME/google-cloud-sdk/path.fish.inc"
 
+# Google Cloud SDK.
+if test -f "$HOME/google-cloud-sdk/path.fish.inc"
+    source "$HOME/google-cloud-sdk/path.fish.inc"
+end
 
 set --export PATH $PA