From 772814d25620f586af33e5ddfa63f1356ff04fae Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Wed, 13 Mar 2019 15:36:46 -0400 Subject: ob-*: Add more return statements --- diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh index 3c7cac2..14ae813 100644 --- a/src/ob-buildenv.sh +++ b/src/ob-buildenv.sh @@ -35,6 +35,8 @@ setup_build_helper() unset IFS printf "PATH='%s'\n" "${PATH}" + + return 0 } setup_toolchain() @@ -67,6 +69,8 @@ setup_toolchain() STRIP='${tool_prefix}strip' OPK_TOOL_PREFIX='${tool_prefix}' EOF + + return 0 } setup_build_flags() @@ -75,6 +79,8 @@ setup_build_flags() if [ -r "${build_flags}" ]; then . "${build_flags}" fi + + return 0 } main() @@ -89,6 +95,8 @@ main() setup_build_helper setup_toolchain setup_build_flags + + return 0 } main "${@}" diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh index 2e18855..0e9aa6f 100644 --- a/src/ob-buildopk.sh +++ b/src/ob-buildopk.sh @@ -34,6 +34,8 @@ build_opk() tar -czf "../../${binary}_${version}_${arch}_${plat}.opk" \ 'debian-binary' 'data.tar.gz' 'control.tar.gz' rm -Rf 'data.tar.gz' 'control.tar.gz' + + return 0 } main() @@ -56,6 +58,8 @@ main() done fi rm 'debian-binary' + + return 0 } main "${@}" diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index f6685c2..211993e 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -53,6 +53,8 @@ write_changes() printf 'Changes:\n%s\n' "$(ob_get_source_parameter 'Changes' | \ sed 's/^$/./; s/^/ /;')" >&3 + + return 0 } write_files_src() @@ -62,6 +64,8 @@ write_files_src() printf ' %s %s %s\n' \ "$(wc -c "../../${file}" | cut -d ' ' -f 1)" \ 'base' "${file}" >&3 + + return 0 } write_files_bin() @@ -77,6 +81,8 @@ write_files_bin() "$(wc -c "../../${file}" | cut -d ' ' -f 1)" \ 'base' "${file}" >&3 done + + return 0 } main() @@ -103,6 +109,8 @@ main() write_files_bin exec 3>&- fi + + return 0 } main "${@}" diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh index 7c1e2eb..738ac9e 100644 --- a/src/ob-gencontrol.sh +++ b/src/ob-gencontrol.sh @@ -109,6 +109,8 @@ gen_control() printf '%s: %s\n' 'Homepage' "${homepage}" \ >>"${binary}.control/control" fi + + return 0 } install_maintainer_scripts() @@ -125,6 +127,8 @@ install_maintainer_scripts() chmod 755 "${binary}.control/${script}" fi done + + return 0 } gen_conffiles() @@ -140,6 +144,8 @@ gen_conffiles() chmod 644 "${binary}.control/conffiles" fi fi + + return 0 } gen_md5sums() @@ -154,6 +160,8 @@ gen_md5sums() else chmod 644 "${binary}.control/md5sums" fi + + return 0 } main() @@ -183,6 +191,8 @@ main() gen_md5sums "${pkg}" done fi + + return 0 } main "${@}" diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh index fd9e607..80b9831 100644 --- a/src/ob-installplatconf.sh +++ b/src/ob-installplatconf.sh @@ -63,6 +63,8 @@ copy_config() cp -p "${src_base}/${src}" "${dest_base}/${dest}" || \ ob_error "$(ob_get_msg 'cant_copy_config_file')" done <"../${list}" + + return 0 } main() @@ -87,6 +89,8 @@ main() done "${copied}" || ob_info "$(ob_get_msg 'no_plat_config')" + + return 0 } main "${@}" diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh index fab5659..1202ce0 100644 --- a/src/ob-unpacksource.sh +++ b/src/ob-unpacksource.sh @@ -99,13 +99,12 @@ get_upstream_dir() return 1 ;; 1) + return 0 ;; *) ob_error "$(ob_get_msg 'multiple_top_upstream_dirs')" return 1 esac - - return 0 } extract_upstream() -- cgit v0.9.1