Skip to content

Commit

Permalink
beesh: avoid warnings of beeversion
Browse files Browse the repository at this point in the history
this is save, because after every call the completeness of the
output is checked and a wrong syntax will be detected
  • Loading branch information
donald committed Jul 5, 2016
1 parent b60de32 commit bf78185
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/beesh.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -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)
}

###############################################################################
Expand Down Expand Up @@ -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)"
Expand Down

0 comments on commit bf78185

Please sign in to comment.