From 3aaed0d02571d3615ab466802d0067a7cbb8cb0f Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Thu, 2 Aug 2012 16:41:05 +0200 Subject: [PATCH] beesh: Allow to rename package from within bee-file (quick fix version) this should be reimplemented later.. 8) --- src/beesh.sh.in | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/beesh.sh.in b/src/beesh.sh.in index 07b4557..cbe272f 100644 --- a/src/beesh.sh.in +++ b/src/beesh.sh.in @@ -534,7 +534,7 @@ function bee_pkg_pack() { ${D}/CONTENT ) beefilename=${BEE##*/} - beefiledest=${BEE_BEEDIR}/${beefilename} + beefiledest=${BEE_BEEDIR}/${PKGALLPKG}.bee print_info "-> saving bee-file ${beefilename} .." print_info "${COLOR_CYAN}${beefiledest}" @@ -543,7 +543,7 @@ function bee_pkg_pack() { mkdir -pv ${BEE_BEEDIR} fi - cp -v ${BEE} ${BEE_BEEDIR} + cp -v ${BEE} ${beefiledest} } @@ -793,9 +793,13 @@ PKGALLPKG= # now set PKGARCH if set or changed by user via ARCH=.. and not given via file.arch.bee : ${PKGARCH:=${ARCH}} +PKGFULLPKG=${PKGFULLNAME}-${PKGFULLVERSION}-${PKGREVISION} + # since PKGARCH is now known reconstruct PKGALLPKG : ${PKGALLPKG:=${PKGFULLPKG}.${PKGARCH}} +eval $(${BEE_BINDIR}/beeversion ${PKGALLPKG}) + config_handle_deprecated_beefile expand_prefix_variables config_export