small fixes

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@119 04377dda-e619-0410-9926-eae83683ac58

diff --git a/lib/common.sh b/lib/common.sh
index 495304144289196415f770aad2ffef4226da6767..2065739d588696805963b2c5a3440c2b56133ea9 100644 (file)
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -120,7 +120,6 @@ function install_packages {
         SILENT=1 ARCH=$ARCH VERSION=$VERSION $SIMPLARET --purge
       fi
     else
-      echo error: could not install package $pack
       unable_to_install="$unable_to_install\n\t$pack"
     fi
 

diff --git a/src/simplaret b/src/simplaret
index b8879eb12ccb8775c33c28766ba51ffe7aee506f..d4ccdb2ebea70c00dec6f1149656a45433dd1eb1 100755 (executable)
--- a/src/simplaret
+++ b/src/simplaret
@@ -691,15 +691,15 @@ function simplaret_install {
 
   package="`simplaret_get $1 --silent`"
 
-  if [ "$?" == "0" ]; then
+  if [ "$?" == "0" ] && [ ! -z "$package" ]; then
     if [ -f "$package" ]; then
       ROOT=$root upgradepkg --install-new $package
     else
-      echo "error: could not install package $package: file not found"
+      echo "error: could not install package $1: file not found"
       return 1
     fi
   else
-    echo "error: could not install package $package"
+    echo "error: could not install package $1"
     return 1
   fi