Use -f file checks before sourcing

Sergej Leibenzon · Sergej Leibenzon · commit e44e864b2850 · 2015-08-13T12:49:35.000+02:00
diff --git a/hook b/hook
@@ -9,8 +9,13 @@ HAS_NODE=`which node 2> /dev/null || which nodejs 2> /dev/null || which iojs 2>
 #
 # https://answers.atlassian.com/questions/140339/sourcetree-hook-failing-because-paths-don-t-seem-to-be-set-correctly
 #
+function source_home_file {
+  file="$HOME/$1"
+  [[ -f "${file}" ]] && source "${file}"
+}
+
 if [[ -z "$HAS_NODE" ]]; then
-  source ~/.bash_profile || source ~/.zshrc || true
+  source_home_file ".bash_profile" || source_home_file ".zshrc" || true
 fi
 
 NODE=`which node 2> /dev/null`

Original file line number	Diff line number	Diff line change
@@ -9,8 +9,13 @@ HAS_NODE=`which node 2> /dev/null \|\| which nodejs 2> /dev/null \|\| which iojs 2>
`9`	`9`	`#`
`10`	`10`	`# https://answers.atlassian.com/questions/140339/sourcetree-hook-failing-because-paths-don-t-seem-to-be-set-correctly`
`11`	`11`	`#`
	`12`	`+function source_home_file {`
	`13`	`+ file="$HOME/$1"`
	`14`	`+ [[ -f "${file}" ]] && source "${file}"`
	`15`	`+}`
	`16`	`+`
`12`	`17`	`if [[ -z "$HAS_NODE" ]]; then`
`13`		`- source ~/.bash_profile \|\| source ~/.zshrc \|\| true`
	`18`	`+ source_home_file ".bash_profile" \|\| source_home_file ".zshrc" \|\| true`
`14`	`19`	`fi`
`15`	`20`
`16`	`21`	NODE=`which node 2> /dev/null`