diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-13 13:42:06 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-03-13 13:42:06 (EDT) |
| commit | 8850981d7362f95623b58d5af34343f1f8395eb6 (patch) | |
| tree | 319a192daf5d5e6315ca6c72197a06ebe29f3243 /src/ob-installdocs.sh | |
| parent | 176161e071d50ee2f4873d21f8396c03a929c45d (diff) | |
ob-*: Add return statements after ob_error() calls
Diffstat (limited to 'src/ob-installdocs.sh')
| -rw-r--r-- | src/ob-installdocs.sh | 36 |
1 files changed, 28 insertions, 8 deletions
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 "${@}" |