packages: lighttpd/lighttpd-branch.sh - move filtering code to function

[glen]

Author: glen                         Date: Mon Sep 21 13:34:12 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- move filtering code to function

---- Files affected:
packages/lighttpd:
   lighttpd-branch.sh (1.13 -> 1.14) 

---- Diffs:

================================================================
Index: packages/lighttpd/lighttpd-branch.sh
diff -u packages/lighttpd/lighttpd-branch.sh:1.13 packages/lighttpd/lighttpd-branch.sh:1.14
--- packages/lighttpd/lighttpd-branch.sh:1.13	Mon Sep 21 15:23:45 2009
+++ packages/lighttpd/lighttpd-branch.sh	Mon Sep 21 15:34:07 2009
@@ -4,15 +4,23 @@
 tag=lighttpd-1.4.23
 branch=lighttpd-1.4.x
 
+d=$-
+filter() {
+	set -$d
+	# Excluding files which change version or were not in dist tarball
+	filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' | \
+	# remove revno's for smaller diffs
+	sed -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,'
+}
+
 old=$svn/tags/$tag
 new=$svn/branches/$branch
-echo "Running diff: $old -> $new"
-LC_ALL=C svn diff --old=$old --new=$new > lighttpd-branch.diff.tmp
-
-echo "Excluding files which change version or were not in dist tarball"
-filterdiff -x tests/mod-extforward.conf -x ChangeLog -x .cvsignore -x src/.cvsignore -x tests/.cvsignore -x doc/.cvsignore -x 'configure.in' -x 'SConstruct' -x 'CMakeLists.txt' -x 'src/CMakeLists.txt' -x 'src/config.h.cmake' -x 'src/mod_uploadprogress.c' lighttpd-branch.diff.tmp > lighttpd-branch.diff.tmp2
-mv -f lighttpd-branch.diff.tmp2 lighttpd-branch.diff
-rm -f lighttpd-branch.diff.tmp
+echo >&2 "Running diff: $old -> $new"
+LC_ALL=C svn diff --old=$old --new=$new | filter > lighttpd-branch.diff.tmp
 
-# remove revno's for smaller diffs
-sed -i -e 's,^\([-+]\{3\} .*\)\t(revision [0-9]\+)$,\1,' lighttpd-branch.diff
+if cmp -s lighttpd-branch.diff{,.tmp}; then
+	echo >&2 "No new diffs..."
+	rm -f lighttpd-branch.diff.tmp
+	exit 0
+fi
+mv -f lighttpd-branch.diff{.tmp,}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lighttpd/lighttpd-branch.sh?r1=1.13&r2=1.14&f=u