common.sh: install_packages fix

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

1 files changed, 14 insertions, 1 deletions

diff --git a/lib/common.sh b/lib/common.sh
index ed00779..5da1ed7 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -132,12 +132,25 @@ function install_packages {
     # if the package wasnt found, try to donwload it
     if [[ "$package_downloaded" != "1" ]]; then
       ARCH=$ARCH VERSION=$VERSION $SIMPLARET --get $pack -a
-      for file in `find $STORAGE/$extrafolder -name $pack*tgz`; do
+
+      # it can be stored at the patches folder
+      for file in `find $PATCHES_DIR/$extrafolder -name $pack*tgz`; do
         if [[ "`package_name $file`" == "$pack" ]]; then
           package_file="$file"
           break
         fi
       done
+
+      # or it can be stored at the standard packages folder
+      if [ -z "$package_file" ]; then
+        for file in `find $STORAGE/$extrafolder -name $pack*tgz`; do
+          if [[ "`package_name $file`" == "$pack" ]]; then
+            package_file="$file"
+            break
+          fi
+        done
+      fi
+
     fi
 
     # now tries to install the package, if available