From 7c417b97c38158a7b0d4978bbb6f28174cc9aee3 Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Sat, 14 Oct 2006 11:30:03 +0000
Subject: some updates; see CHANGELOG for details

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@17 04377dda-e619-0410-9926-eae83683ac58
---
 src/rebuildpkg | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'src/rebuildpkg')

diff --git a/src/rebuildpkg b/src/rebuildpkg
index 43c76cd..6d3d10c 100755
--- a/src/rebuildpkg
+++ b/src/rebuildpkg
@@ -38,7 +38,7 @@ fi
 
 pack="$1"
 
-for file in `find $ROOT/var/log/packages -name $pack*`; do
+for file in `ls $ROOT/var/log/packages/$pack*`; do
   if [[ "`package_name $file.tgz`" == "$pack" ]]; then
     package_file="$file"
     break
@@ -47,6 +47,7 @@ done
 
 if [ -z "$package_file" ]; then
   echo error: package $pack does not exist
+  exit 1
 fi 
 
 if [ -d "$TMP/package-$pack" ]; then
@@ -60,11 +61,14 @@ for file in `grep -v -e "^PACKAGE NAME:" -e "^UNCOMPRESSED PACKAGE SIZE:"    \
                      -e "^COMPRESSED PACKAGE SIZE:" -e "^PACKAGE LOCATION:"  \
                      -e "^PACKAGE DESCRIPTION:" -e "^$pack:" -e "^FILE LIST:" $package_file`; do
 
-  if [ -d /$file ]; then
-    mkdir -p $TMP/package-$pack/$file
-  elif [ -f /$file ]; then
-    cp /$file $TMP/package-$pack/$file
-  else echo file /$file was not found, please add it manually, exploding and making the package again
+  if [ "$file" != "install" ] && [ "$file" != "install/slack-desc" ] && [ "$file" != "install/doinst,sh" ]; then
+    if [ -d /$file ]; then
+      mkdir -p $TMP/package-$pack/$file
+    elif [ -f /$file ]; then
+      cp /$file $TMP/package-$pack/$file
+    else
+      echo file /$file was not found, please add it manually, exploding and making the package again
+    fi
   fi
 
 done
-- 
cgit v1.2.3