common.sh: fixes on metafiles generation

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index ee0495c5a744f23624f0c251ed0f4dda3718a626..67900d1838e65258b610d08faef386ae593d1acb 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -6,6 +6,8 @@ simplepkg changelog
 
   - simplaret:
     - small fix
+  - common.sh:
+    - fixes on metafiles generation
 
 0.5pre21
 ========

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index aa6a8d7afb8fe5b9eddc1cecc880ca3f9d83f218..2be3ec677b543d09622e96cd4ac12da40710ffba 100644 (file)
--- a/trunk/lib/common.sh
+++ b/trunk/lib/common.sh
@@ -574,9 +574,7 @@ function svn_add_meta {
 function gen_filelist {
 
   # generate FILELIST.TXT
-  # usage: gen_filelist <folder>
-
-  local cwd
+  # usage: gen_filelist
 
   for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILELIST.TXT
   echo "Created new FILELIST.TXT"
@@ -593,7 +591,7 @@ function gen_patches_filelist {
     cwd="`pwd`"
     cd $1
     for file in `find | grep -e ".tgz$"`; do ls -l $file; done > FILE_LIST
-    cd $pwd
+    cd $cwd
 
     if [ "$1" == "." ]; then
       echo "Created new FILE_LIST"
@@ -618,7 +616,7 @@ function gen_packages_txt {
     echo '' > PACKAGES.TXT
     find . -type f -name '*.meta' -exec cat {} \; >> PACKAGES.TXT
     cat PACKAGES.TXT | gzip -9 -c - > PACKAGES.TXT.gz
-    cd $pwd
+    cd $cwd
 
     if [ "$1" == "." ]; then
       echo "Created new PACKAGES.TXT and PACKAGES.TXT.gz"
@@ -643,7 +641,7 @@ function gen_md5_checksums {
     echo '' > CHECKSUMS.md5
     find . -type f -name '*.tgz' -exec md5sum {} \; >> CHECKSUMS.md5
     cat CHECKSUMS.md5 | gzip -9 -c - > CHECKSUMS.md5.gz
-    cd $pwd
+    cd $cwd
 
     if [ "$1" == "." ]; then
       echo "Created new CHECKSUMS.md5 and CHECKSUMS.md5.gz"

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 4b088d4fb5d374a8ce8809a2de51ba2a1302aab0..a9e90e89ed6b712008f8e55af3db1c09e73a230d 100755 (executable)
--- a/trunk/simplepkg.SlackBuild
+++ b/trunk/simplepkg.SlackBuild
@@ -6,7 +6,7 @@
 PACKAGE="simplepkg"
 PACK_DIR="package-$PACKAGE"
 BUILD=${BUILD:=1rha}
-VERSION="0.5pre21"
+VERSION="0.5pre22"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"