diff --git a/src/beesh.sh.in b/src/beesh.sh.in index b7b91c5..d0b7780 100644 --- a/src/beesh.sh.in +++ b/src/beesh.sh.in @@ -732,7 +732,7 @@ function save_current_package_variables() { oPKGREVISION=${PKGREVISION} } -function verify_new_package_variables() { +function extract_new_package_variables() { nPKGFULLNAME="${PKGNAME}${PKGEXTRANAME:+_${PKGEXTRANAME}}" if [ "${oPKGFULLNAME}" != "${PKGFULLNAME}" ] ; then @@ -763,9 +763,7 @@ function verify_new_package_variables() { fi fi PKGFULLVERSION="${PKGVERSION}${PKGEXTRAVERSION:+_${PKGEXTRAVERSION}}" -} -function extract_new_package_variables() { if [ "${PKGNAME}" != "${oPKGNAME}" ] ; then # pkgname changed! we allow prefixing 'anything-' to the packagename if [ "${PKGNAME}" != "${PKGNAME/-${oPKGNAME}}-${oPKGNAME}" ] ; then @@ -989,7 +987,6 @@ save_current_package_variables # now set PKGARCH if set or changed by user via ARCH=.. and not given via file.arch.bee : ${PKGARCH:=${ARCH}} -verify_new_package_variables extract_new_package_variables config_handle_deprecated_beefile