some bugfixes

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

diff --git a/trunk/doc/CHANGELOG b/trunk/doc/CHANGELOG
index 00013b27b57b3b6d5076adedb88ca995e6731c60..438e183a8b19281a4ce5940913c995dda0a5c6a9 100644 (file)
--- a/trunk/doc/CHANGELOG
+++ b/trunk/doc/CHANGELOG
@@ -1,6 +1,21 @@
 simplepkg changelog
 ===================
 
+0.5pre11
+========
+
+  - bugfix
+
+0.5pre10
+========
+
+  - bugfix
+
+0.5pre9
+=======
+
+   - bugfixes
+
 0.5pre8
 =======
 

diff --git a/trunk/lib/common.sh b/trunk/lib/common.sh
index 6bbfca0d3f47bddb621e283285128bb67af56be0..e54ba95243d09f18fdc5071c8183d38813f9b621 100644 (file)
--- 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"

diff --git a/trunk/simplepkg.SlackBuild b/trunk/simplepkg.SlackBuild
index 88fe4a401e2bb5a2ab8aaae2050080045c744c10..edd11fa682659f3335d13e6781f4d11b6453a034 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.5pre8"
+VERSION="0.5pre11"
 ARCH="noarch"
 LIBEXEC="/usr/libexec/$PACKAGE"
 BINDIR="/usr/bin"

diff --git a/trunk/src/repos b/trunk/src/repos
index 191af44f69637f8e74ad7777aa1860868fbc0156..5011043e2f8336022fcea2a911a4b7d891026558 100755 (executable)
--- a/trunk/src/repos
+++ b/trunk/src/repos
@@ -69,13 +69,15 @@ case "$1" in
       svn_add_meta
     ;;
     PACKAGESTXT)
-      gen_packages_txt
+      gen_packages_txt .
+      gen_packages_txt patches
     ;;
     FILELIST)
       gen_filelist
     ;;
     MD5)
-      gen_md5_checksums
+      gen_md5_checksums .
+      gen_md5_checksums patches
     ;;
     usage)
       usage

diff --git a/trunk/src/simplaret b/trunk/src/simplaret
index 4081f5e3ba1882490f50f06c10ff382cd3ee0ca2..d79f7c00e1f432a0590f07969f268ffd6a6bff5c 100755 (executable)
--- a/trunk/src/simplaret
+++ b/trunk/src/simplaret
@@ -556,9 +556,11 @@ function simplaret_get {
         if [ -f "$folder/$candidate.asc" ] || [ "$SIGNATURE_CHECKING" == "1" ]; then
           gpg --verify $folder/$candidate.asc $folder/$candidate
         fi
-        # generate the patches FILE_LIST if needed
+        # generate the patches FILE_LIST and PACKAGES.TXT if needed
         if [ "$generate_patches" == "1" ]; then
           gen_patches_filelst $folder
+          gen_packages_txt $folder
+          gen_md5_checksums $folder
         fi
         simplaret_checksum $storage/$repository_name/CHECKSUMS.md5 $folder/$candidate $silent
         return $?