some bugfixes

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

1 files changed, 52 insertions, 23 deletions

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 6bbfca0..e54ba95 100644
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -570,6 +570,7 @@ function svn_add_meta {
 function gen_filelist {
 
   # generate FILELIST.TXT
+  # usage: gen_filelist <folder>
 
   local cwd
 
@@ -578,37 +579,55 @@ function gen_filelist {
 
   if [ -d "patches" ]; then
     gen_patches_filelist patches
-    for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST
     echo "Created new patches/FILE_LIST"
   fi
 
 }
 
-function gen_patches_filelst {
+function gen_patches_filelist {
 
   # generate FILE_LIST
+  # usage: gen_patches_filelist <folder>
 
-  mkdir -p $1
-  cwd="`pwd`"
-  cd $1
-  for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST
-  cd $pwd
+  if [ ! -z "$1" ]; then
+    mkdir -p $1
+    cwd="`pwd`"
+    cd $1
+    for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST
+    cd $pwd
+
+    if [ "$1" == "." ]; then
+      echo "Created new FILE_LIST"
+    else
+      echo "Created new $1/FILE_LIST"
+    fi
+
+  fi
 
 }
 
 function gen_packages_txt {
 
   # generate PACKAGES.TXT
+  # usage: gen_packages_txt <folder>
 
-  echo '' > PACKAGES.TXT
-  find . -type f -name '*.meta' -exec cat {} \; >> PACKAGES.TXT
-  cat PACKAGES.TXT | gzip -9 -c - > PACKAGES.TXT.gz
-  echo "Created new PACKAGES.TXT and PACKAGES.TXT.gz"
+  if [ ! -z "$1" ]; then
+
+    mkdir -p $1
+    cwd="`pwd`"
+    cd $1
+
+    echo '' > PACKAGES.TXT
+    find . -type f -name '*.meta' -exec cat {} \; >> PACKAGES.TXT
+    cat PACKAGES.TXT | gzip -9 -c - > PACKAGES.TXT.gz
+    cd $pwd
+
+    if [ "$1" == "." ]; then
+      echo "Created new PACKAGES.TXT and PACKAGES.TXT.gz"
+    else
+      echo "Created new $1/PACKAGES.TXT and $1/PACKAGES.TXT.gz"
+    fi
 
-  if [ -d "patches" ]; then
-    find patches -type f -name '*.meta' -exec cat {} \; >> patches/PACKAGES.TXT
-    cat patches/PACKAGES.TXT | gzip -9 -c - > patches/PACKAGES.TXT.gz
-    echo "Created new patches/PACKAGES.TXT and patches/PACKAGES.TXT.gz"
   fi
 
 }
@@ -616,16 +635,25 @@ function gen_packages_txt {
 function gen_md5_checksums {
 
   # generate CHECKSUMS.md5
+  # usage: gen_md5_checksums <folder>
 
-  echo '' > CHECKSUMS.md5
-  find . -type f -name '*.tgz' -exec md5sum {} \; >> CHECKSUMS.md5
-  cat CHECKSUMS.md5 | gzip -9 -c - > CHECKSUMS.md5.gz
-  echo "Created new CHECKSUMS.md5 and CHECKSUMS.md5.gz"
+  if [ ! -z "$1" ]; then
+
+    mkdir -p $1
+    cwd="`pwd`"
+    cd $1
+
+    echo '' > CHECKSUMS.md5
+    find . -type f -name '*.tgz' -exec md5sum {} \; >> CHECKSUMS.md5
+    cat CHECKSUMS.md5 | gzip -9 -c - > CHECKSUMS.md5.gz
+    cd $pwd
+
+    if [ "$1" == "." ]; then
+      echo "Created new CHECKSUMS.md5 and CHECKSUMS.md5.gz"
+    else
+      echo "Created new $1/CHECKSUMS.md5 and $1/CHECKSUMS.md5.gz"
+    fi
 
-  if [ -d "patches" ]; then
-    find patches -type f -name '*.tgz' -exec md5sum {} \; >> patches/CHECKSUMS.md5
-    cat patches/CHECKSUMS.md5 | gzip -9 -c - > patches/CHECKSUMS.md5.gz
-    echo "Created new patches/CHECKSUMS.md5 and patches/CHECKSUMS.md5.gz"
   fi
 
 }
@@ -633,6 +661,7 @@ function gen_md5_checksums {
 function gen_meta {
 
   # generate metafiles
+  # usage: gen_meta <package-file>
 
   if [ ! -f $1 ]; then
     echo "File not found: $1"