X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=percona.sh;h=722a35a8a904ce1fd99205fc6348d4ed4347938d;hb=0ccdf405e3107c59cecc48acc4a28c4e90b36e85;hp=ef15c590c6ea114a3feafe5e90345d0a01cfb079;hpb=afb072c594c1f3cb3519cb295fe0244b9e5361fe;p=packages%2Fmysql.git

diff --git a/percona.sh b/percona.sh
index ef15c59..722a35a 100644
--- a/percona.sh
+++ b/percona.sh
@@ -1,11 +1,14 @@
 #!/bin/sh
 # updates percona patches
 # http://www.percona.com/docs/wiki/repositories:start
+# http://bazaar.launchpad.net/~percona-dev/percona-server/5.5.8/files
 # https://launchpad.net/percona-server/5.5
 # bzr branch lp:percona-server/5.5
 
 version=5.5
 bzr_branch=lp:percona-server/$version
+#version=5.5.9
+#bzr_branch=lp:percona-dev/percona-server/$version
 branch=
 
 filter_names() {
@@ -18,6 +21,8 @@ filter_files() {
 	filterdiff -x '*/configure'
 }
 
+set -e
+
 if [ -d $version ]; then
 	cd $version
 	bzr pull
@@ -29,14 +34,15 @@ fi
 > .percona.spec
 > .patch.spec
 i=100
-for patch in $(cat $version/series | filter_names); do
+[ -d "$version/patches" ] && dir=$version/patches || dir=$version
+for patch in $(cat $dir/series | filter_names); do
 	# if patch already existed, use mysql- prefix
 	if [ -f mysql-$patch ]; then
 		file=mysql-$patch
 	else
 		file=$patch
 	fi
-	cat $version/$patch | filter_files > $file
+	cat $dir/$patch | filter_files > $file
 
 	if [ -z "$(awk -vfile=$file -F/ '$2 == file{print}' CVS/Entries)" ]; then
 		cvs add $file