From 632ec0d8518f1ee1b2af1eeae6a9d967dd26b16f Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>
Date: Sun, 30 Aug 2009 20:53:15 +0000
Subject: Attempt to fix #94 and #95

git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@811 04377dda-e619-0410-9926-eae83683ac58
---
 trunk/utils/add-slack-required | 2 +-
 trunk/utils/repos              | 6 +++---
 trunk/utils/searchpkg          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'trunk/utils')

diff --git a/trunk/utils/add-slack-required b/trunk/utils/add-slack-required
index 67804d0..c1e25ca 100755
--- a/trunk/utils/add-slack-required
+++ b/trunk/utils/add-slack-required
@@ -51,7 +51,7 @@ function search_and_copy_slackbuild {
 
 }
 
-for package in `find $repository/ -name *tgz`; do
+for package in `find $repository/ $(pkg_ext_find)`; do
   pack="`package_name $package`"
   for build_script in `find $slackbuild/ -name $pack.SlackBuild`; do
 
diff --git a/trunk/utils/repos b/trunk/utils/repos
index e4a17ee..57ecdff 100755
--- a/trunk/utils/repos
+++ b/trunk/utils/repos
@@ -30,7 +30,7 @@ function usage {
 
 function do_all {
 
-  for pkg in `find . -type f -name '*.tgz' -print`; do
+  for pkg in `find . -type f $(pkg_ext_find) -print`; do
     gen_meta $pkg
   done
   $0 PACKAGESTXT
@@ -55,8 +55,8 @@ case "$1" in
       do_all
     ;;
     new)
-      for pkg in `find . -type f -name '*.tgz' -print`; do
-        if [ ! -f ${pkg%tgz}meta ]; then
+      for pkg in `find . -type f $(pkg_ext_find) -print`; do
+        if [ ! -f $(strip_pkg_ext $pkg).meta ]; then
           gen_meta $pkg
         fi
       done
diff --git a/trunk/utils/searchpkg b/trunk/utils/searchpkg
index cc5a827..1986e00 100755
--- a/trunk/utils/searchpkg
+++ b/trunk/utils/searchpkg
@@ -30,7 +30,7 @@ FILELIST="$1/FILELIST.TXT"
 PACKAGE_FIELD="8"
 
 if [ -z "$2" ]; then
- grep .tgz $FILELIST
+ grep -E -e "$(pkg_ext_grep)" $FILELIST
 else
-  grep -e "$2" $FILELIST | grep tgz | awk "{ print \$$PACKAGE_FIELD }"
+  grep -e "$2" $FILELIST | grep -E -e "$(pkg_ext_grep)" | awk "{ print \$$PACKAGE_FIELD }"
 fi
-- 
cgit v1.2.3