From 8850981d7362f95623b58d5af34343f1f8395eb6 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Wed, 13 Mar 2019 13:42:06 -0400
Subject: ob-*: Add return statements after ob_error() calls

---
(limited to 'src/ob-installdocs.sh')

diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index 484a01b..292925c 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -30,20 +30,30 @@ install_docs()
 	for src in ${srcs}; do
 		if [ -f "${src}" ]; then
 			if [ "${dest%/*}" != "${dest}" ]; then
-				mkdir -p "${data_doc_dir}/${dest%/*}" || \
+				if ! mkdir -p "${data_doc_dir}/${dest%/*}"; then
 					ob_error "$(ob_get_msg 'cant_make_doc_dir')"
+					return 1
+				fi
 			fi
-			cp -R "${src}" "${data_doc_dir}/${dest}" || \
+			if ! cp -R "${src}" "${data_doc_dir}/${dest}"; then
 				ob_error "$(ob_get_msg 'cant_cp_doc_file')" "${src}"
+				return 1
+			fi
 		elif [ -d "${src}" ]; then
 			if [ "${dest%/*}" != "${dest}" ]; then
-				mkdir -p "${data_doc_dir}/${dest%/*}" || \
+				if ! mkdir -p "${data_doc_dir}/${dest%/*}"; then
 					ob_error "$(ob_get_msg 'cant_make_doc_dir')"
+					return 1
+				fi
 			fi
-			cp -R "${src}/." "${data_doc_dir}/${dest}" || \
+			if ! cp -R "${src}/." "${data_doc_dir}/${dest}"; then
 				ob_error "$(ob_get_msg 'cant_cp_doc_file')" "${src}"
+				return 1
+			fi
 		fi
 	done
+
+	return 0
 }
 
 main()
@@ -55,6 +65,7 @@ main()
 
 	if ! doc_pkg="$(ob_get_doc_package)"; then
 		ob_error "$(ob_get_msg 'cant_get_doc_pkg')"
+		return 1
 	fi
 	doc_pkg_doc_dir="$(ob_get_system_path 'package-docs' \
 		"${doc_pkg}" "${OPK_BINARY_VERSION}")"
@@ -68,11 +79,13 @@ main()
 				ob_info "$(ob_get_msg 'docs_already_installed')" "${pkg}"
 			else
 				ob_info "$(ob_get_msg 'installing_docs')" "${pkg}"
-				mkdir -p "${data_doc_dir}" || \
+				if ! mkdir -p "${data_doc_dir}"; then
 					ob_error "$(ob_get_msg 'cant_make_doc_dir')"
+					return 1
+				fi
 				while read srcs dest; do
 					install_docs "${srcs}" "${dest}" \
-						"${data_doc_dir}"
+						"${data_doc_dir}" || return 1
 				done <<-EOF
 					$(ob_get_doc_files "${OPK_HOST_ARCH}" \
 						"${OPK_HOST_PLAT}")
@@ -83,13 +96,20 @@ main()
 				ob_info "$(ob_get_msg 'docs_already_linked')" "${pkg}"
 			else
 				ob_info "$(ob_get_msg 'linking_docs')" "${pkg}"
-				mkdir -p "${data_doc_dir%/*}" || \
+				if ! mkdir -p "${data_doc_dir%/*}"; then
 					ob_error "$(ob_get_msg 'cant_make_doc_dir')"
-				ln -s "${doc_pkg_doc_dir}" "${data_doc_dir}" || \
+					return 1
+				fi
+				if ! ln -s "${doc_pkg_doc_dir}" \
+						"${data_doc_dir}"; then
 					ob_error "$(ob_get_msg 'cant_ln_doc_dir')"
+					return 1
+				fi
 			fi
 		fi
 	done
+
+	return 0
 }
 
 main "${@}"
--
cgit v0.9.1