From f5fa249de04bacca63f317b7aac18a51c2771767 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 1 Jul 2016 13:42:16 +0200 Subject: [PATCH] beesh: avoid warnings of beeversion this is save, because after every call the completeness of the output is checked and a wrong syntax will be detected --- src/beesh.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/beesh.sh.in b/src/beesh.sh.in index d023456..887c259 100644 --- a/src/beesh.sh.in +++ b/src/beesh.sh.in @@ -217,7 +217,7 @@ function bee_version() { test -n "$1" || bee_die "bee_version: missing argument" test "$PKGFULLVERSION"="0" -a -z "$PKGREVISION" || bee_die "bee_version: version is already fixed" local oPKGFULLNAME="$PKGFULLNAME" - eval $("${BEE_BINDIR}/beeversion" "$1") || bee_die "bee_version: invalid version string" + eval $("${BEE_BINDIR}/beeversion" "$1" 2>/dev/null) || bee_die "bee_version: invalid version string" validate_pkg_complete || bee_die "bee_version: please use the proper package versioning (e.g. package-1.0-0)" test "$PKGFULLNAME" = "$oPKGFULLNAME" || bee_die "bee_version: not allowed to change the package name from $oPKGFULLNAME to $PKGFULLNAME" } @@ -807,7 +807,7 @@ function extract_new_package_variables() { # since PKGARCH is now known reconstruct PKGALLPKG : ${PKGALLPKG:=${PKGFULLPKG}.${PKGARCH}} - eval $("${BEE_BINDIR}/beeversion" "${PKGALLPKG}") + eval $("${BEE_BINDIR}/beeversion" "${PKGALLPKG}" 2>/dev/null) } ############################################################################### @@ -965,7 +965,7 @@ PKGNAME= PKGVERSION= PKGREVISION= -eval $("${BEE_BINDIR}/beeversion" "${BEE}") +eval $("${BEE_BINDIR}/beeversion" "${BEE}" 2>/dev/null) validate_pkg_complete_from_filename || \ bee_die "filename $BEE is invalid. (valid examples: bla-0.bee bla-1.2.3-55.bee bla_lall_x-1.2.3.4_xxx-0.x86_64.bee)"