fixup(c/22962): whitespace & error reporting

Change-Id: I320c7e3d3bf6c2fb1f05a69306f4e70743effa2d

lib/yashchiki/commons.sh

@@ -308,7 +308,11 @@ install_from_buildcache() {
 
 _install_from_buildcache() {
     # only extract the hashes present in buildcache on first invocation
-    if (( "$(wc -l <"${FILE_HASHES_BUILDCACHE}")" == 0 )); then
+    size_file_hashes=0
+    if [ -e "${FILE_HASHES_BUILDCACHE}" ]; then
+        size_file_hashes="$(wc -l <"${FILE_HASHES_BUILDCACHE}")"
+    fi
+    if (( "${size_file_hashes}" == 0 )); then
         compute_hashes_buildcache
     fi
 

lib/yashchiki/fetch.sh

@@ -180,10 +180,13 @@ fi
 fetch_specfiles=()
 for package in "${packages_to_fetch[@]}"; do
     specfile="$(get_specfile_name "${package}")"
-	echo "Specfile for ${package} is ${specfile}."
-	word_count=$(wc -l <"${specfile}")
-    echo "Word count ${word_count}"
-    if (( $(wc -l <"${specfile}") == 0 )); then
+    echo "Specfile for ${package} is ${specfile}."
+    word_count=0
+    if [ -e "${specfile}" ]; then
+        word_count=$(wc -l <"${specfile}")
+    fi
+    echo "Specfile word count ${word_count}"
+    if [ "${word_count}" -eq 0 ]; then
         echo "${package} failed to concretize!" >&2
         exit 1
     fi