From 702e14b8295f4bd61404b7abc25e9b00ffd9bd4a Mon Sep 17 00:00:00 2001 From: Marius Tolzmann Date: Thu, 30 Aug 2012 14:47:13 +0200 Subject: [PATCH] bee-install: Fix installation of packages having invalid names Fixes issue #154 --- src/bee-install.sh.in | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in index ec16979..b417ed6 100644 --- a/src/bee-install.sh.in +++ b/src/bee-install.sh.in @@ -215,12 +215,16 @@ function do_install() { assert "x${file}" != "x" - local pkg=$(${BEE_BINDIR}/beeversion --format="%A" ${file}) - local fullname=$(${BEE_BINDIR}/beeversion --pkgfullname ${file}) + local pkg=$(${BEE_BINDIR}/beeversion --format="%A" ${file} 2>/dev/null) + local fullname=$(${BEE_BINDIR}/beeversion --pkgfullname ${file} 2>/dev/null) local maxinst= local maxall=${pkg} - assert "y${pkg}" != "y" + if [ "y${pkg}" = "y" ] ; then + echo >&2 "bee-install: ${file}: Invalid package name. Skipping." + return 1 + fi + assert "z${fullname}" != "z" debug_msg "do_install file=${file}"