From 87dd847b526d6fe957be9046782e97bb392e494b Mon Sep 17 00:00:00 2001
From: Marius Tolzmann <tolzmann@molgen.mpg.de>
Date: Thu, 30 Aug 2012 16:32:23 +0200
Subject: [PATCH] bee-install: Clarify error/warning messages

This change is related to issue #154

$ touch foo

$ bee install foo
bee-install: foo: Invalid package name. Skipping local file. Continuing.
bee-install: foo: No packages available matching your query.

$ bee install bar
bee-install: bar: No packages available matching your query.

$ bee install ./foo
bee-install: ./foo: Invalid package name. Aborting.

$ bee install ./bar
bee-install: ./bar: No such file or directory.
---
 src/bee-install.sh.in | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/bee-install.sh.in b/src/bee-install.sh.in
index b3a034b..1983033 100644
--- a/src/bee-install.sh.in
+++ b/src/bee-install.sh.in
@@ -124,13 +124,19 @@ function pkg_install() {
 
     # install specific package
     if [ -f "${search}" ] ; then
-         do_install "${search}"
-         return
-    fi
-
-    # if search is path do nothing..
-    if [[ "${search}" =~ "/" ]] ; then
-        echo >&2 "${search}: No such file or directory"
+         if beeversion "${search}" >/dev/null 2>&1 ; then
+            do_install "${search}"
+            return
+         fi
+         if [[ "${search}" =~ "/" ]] ; then
+             echo >&2 "bee-install: ${search}:" \
+                      "Invalid package name. Aborting."
+             return
+         fi
+         echo >&2 "bee-install: ${search}:" \
+                  "Invalid package name. Skipping local file. Continuing."
+    elif [[ "${search}" =~ "/" ]] ; then
+        echo >&2 "bee-install: ${search}: No such file or directory."
         return
     fi
 
@@ -144,7 +150,7 @@ function pkg_install() {
     available=( $(${BEE_LIBEXECDIR}/bee/bee.d/bee-list --available "${search}") )
 
     if [ ${#available[@]} -eq 0 ] ; then
-        echo >&2 "bee-install: ${search}: No matching available package found."
+        echo >&2 "bee-install: ${search}: No packages available matching your query."
         return
     fi