xbmk: clean up a few err calls

Signed-off-by: Leah Rowe <leah@libreboot.org>

include/init.sh

@@ -382,9 +382,11 @@ pybin()
 xbmk_git_init()
 {
 	for gitarg in "--global user.name" "--global user.email"; do
-		gitcmd="git config $gitarg"; $gitcmd 1>/dev/null 2>/dev/null \
-		    || err "Run this first: $gitcmd \"your ${gitcmd##*.}\"" \
-		    "xbmk_git_init" "$@"
+		gitcmd="git config $gitarg"
+		if ! $gitcmd 1>/dev/null 2>/dev/null; then
+			err "Run this first: $gitcmd \"your ${gitcmd##*.}\"" \
+			    "xbmk_git_init" "$@"
+		fi
 	done
 
 	if [ -L ".git" ]; then

include/tree.sh

@@ -372,8 +372,7 @@ project_up_to_date()
 	x_ mkdir -p "$XBMK_CACHE/$hashdir"
 
 	if [ -f "$XBMK_CACHE/$hashdir/$project$hashname" ]; then
-		read -r old_hash < \
-		    "$XBMK_CACHE/$hashdir/$project$hashname" \
+		read -r old_hash < "$XBMK_CACHE/$hashdir/$project$hashname" \
 		    || err \
 		    "$hashdir: err '$XBMK_CACHE/$hashdir/$project$hashname'" \
 		    "project_up_to_date" "$hashdir" "$hashname" "$badhashvar" \