From 888b97fbda8aa867816770fb495dad105411a3eb Mon Sep 17 00:00:00 2001 From: Patrick McDermott Date: Tue, 25 Dec 2018 16:11:38 -0500 Subject: ob-*: Move function definitions before points of use --- (limited to 'src/ob-genchanges.sh') diff --git a/src/ob-genchanges.sh b/src/ob-genchanges.sh index 91d0229..9522204 100644 --- a/src/ob-genchanges.sh +++ b/src/ob-genchanges.sh @@ -19,32 +19,6 @@ . "${LIBDATADIR}/libopkbuild.${SHSOEXT}.${LIBOPKBUILD_SHSOVERSION}" -main() -{ - ob_set_text_domain 'opkbuild' - - ob_init_package '..' || exit 1 - ob_parse_package_metadata -c '.opkbuild.cache' || exit 1 - - if [ -n "${OB_DO_SOURCE}" ]; then - changes="${OPK_SOURCE}_${OPK_SOURCE_VERSION}_src_all.changes" - ob_info "$(ob_get_msg 'gen_changes')" "${changes}" - exec 3>"../../${changes}" - write_changes "${OPK_SOURCE_VERSION}" 'src' 'all' - write_files_src - exec 3>&- - else - changes="${OPK_SOURCE}_${OPK_SOURCE_VERSION}" - changes="${changes}_${OPK_HOST_ARCH}_${OPK_HOST_PLAT}.changes" - ob_info "$(ob_get_msg 'gen_changes')" "${changes}" - exec 3>"../../${changes}" - write_changes "${OPK_BINARY_VERSION}" \ - "${OPK_HOST_ARCH}" "${OPK_HOST_PLAT}" - write_files_bin - exec 3>&- - fi -} - write_changes() { version="${1}" @@ -103,4 +77,30 @@ write_files_bin() done } +main() +{ + ob_set_text_domain 'opkbuild' + + ob_init_package '..' || exit 1 + ob_parse_package_metadata -c '.opkbuild.cache' || exit 1 + + if [ -n "${OB_DO_SOURCE}" ]; then + changes="${OPK_SOURCE}_${OPK_SOURCE_VERSION}_src_all.changes" + ob_info "$(ob_get_msg 'gen_changes')" "${changes}" + exec 3>"../../${changes}" + write_changes "${OPK_SOURCE_VERSION}" 'src' 'all' + write_files_src + exec 3>&- + else + changes="${OPK_SOURCE}_${OPK_SOURCE_VERSION}" + changes="${changes}_${OPK_HOST_ARCH}_${OPK_HOST_PLAT}.changes" + ob_info "$(ob_get_msg 'gen_changes')" "${changes}" + exec 3>"../../${changes}" + write_changes "${OPK_BINARY_VERSION}" \ + "${OPK_HOST_ARCH}" "${OPK_HOST_PLAT}" + write_files_bin + exec 3>&- + fi +} + main "${@}" -- cgit v0.9.1