bee-install: Fix installation of packages having invalid names

Fixes issue #154
mariux64 · Aug 30, 2012 · 702e14b · 702e14b
1 parent dabbd4c
commit 702e14b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git 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}"