[packages/chromium-browser/DEVEL] patch diff always .xz compressed

glen glen at pld-linux.org
Mon Jan 7 23:23:12 CET 2013


commit 83762cddf3c879f48095ca60bcb5c827143984bf
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jan 7 23:08:55 2013 +0200

    patch diff always .xz compressed

 get-source.sh      | 2 +-
 make-diff-patch.sh | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/get-source.sh b/get-source.sh
index 2027bd9..600600b 100755
--- a/get-source.sh
+++ b/get-source.sh
@@ -113,7 +113,7 @@ if [ -e $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT ]; then
 	base=$(readlink -f $DIST_DIR/$PACKAGE_NAME-$BASEVER.tar.$EXT)
 	current=$DIST_DIR/$PACKAGE_NAME-$VERSION.tar.$EXT
 	sh -x $WORK_DIR/make-diff-patch.sh $base $current
-	mv $PACKAGE_NAME-$VERSION.patch.$EXT $DIST_DIR
+	mv $PACKAGE_NAME-$VERSION.patch.xz $DIST_DIR
 fi
 
 # try updating spec and build it as well
diff --git a/make-diff-patch.sh b/make-diff-patch.sh
index e7845b5..7d602e7 100755
--- a/make-diff-patch.sh
+++ b/make-diff-patch.sh
@@ -2,7 +2,6 @@
 # Create .patch based on $1 for $2
 src=$1
 dst=$2
-ext=.tar.xz
 
 unpack() {
 	case "$1" in
@@ -25,8 +24,8 @@ done
 
 set -e
 
-srcdir=$(basename $src $ext)
-dstdir=$(basename $dst $ext)
+srcdir=$(basename ${src%.tar.*})
+dstdir=$(basename ${dst%.tar.*})
 patch=$dstdir.patch
 
 test -d $srcdir || unpack $src
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/chromium-browser.git/commitdiff/a435d242e0eec21403ce4fb7f55bdb8c4d93abae



More information about the pld-cvs-commit mailing list