Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
mariux committed Aug 30, 2012
1 parent 35b51e7 commit 87dd847
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions src/bee-install.sh.in
Expand Up @@ -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

Expand All @@ -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

Expand Down

0 comments on commit 87dd847

Please sign in to comment.