Merge branch 'bugfix' of https://github.com/tewdreyer/bee

* 'bugfix' of https://github.com/tewdreyer/bee: bee-install: fix pathname evaluation of available packages bee-list: fix exact pattern matching in combination with displaying pathnames
mariux64 · Jun 5, 2012 · 41f51ab · 41f51ab
2 parents e6c7abe + 567ccd0
commit 41f51ab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in
@@ -181,7 +181,7 @@ function pkg_install() {
 
     maxavail=$(${BEE_BINDIR}/beeversion -max ${available[@]})
 
-    fileavail=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available --display-pathname ${maxavail}) )
+    fileavail=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available --exact --display-pathname ${maxavail}) )
 
     assert "${#fileavail[@]}" = 1
 

diff --git a/src/bee-list.sh.in b/src/bee-list.sh.in
@@ -207,7 +207,8 @@ function bee_list_exact() {
     fi
 
     for p in $(list_beepackages "${filter}" ${1}) ; do
-        if [ "${1}" = "${p}" ] ; then
+        pall=$(@BINDIR@/beeversion --pkgallpkg "${p}")
+        if [ "${1}" = "${pall}" ] ; then
             echo "${p}"
             continue
         fi