X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=pear-autoup.sh;h=2811026b73d7ab8e95ad4dd2e933b3ece16fb1ff;hb=6c632fde8978ae2c0559b2adf3026a7fec1a408a;hp=bffb0ab0bcc6fabc832fcdfc1a1da557c508359a;hpb=b538c1b3327e0b09151c3545f819e39dc6fd1931;p=packages%2Frpm-build-tools.git

diff --git a/pear-autoup.sh b/pear-autoup.sh
index bffb0ab..2811026 100644
--- a/pear-autoup.sh
+++ b/pear-autoup.sh
@@ -16,7 +16,7 @@ pear info PEAR >/dev/null
 # needed pkgs for upgrade test
 rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging
 
-[ -s pear.desc ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'desc php-pear-*' > pear.desc; }
+[ -s pear.desc ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'search -r php-pear | desc' > pear.desc; }
 [ -s pear.pkgs ] || {
 	awk '/^Source.package:/{print $3}' < pear.desc | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' | sort -u > pear.pkgs
 
@@ -42,9 +42,16 @@ rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging
 }
 [ -s pear.upgrades ] || pear list-upgrades > pear.upgrades
 
+subst=$(pear list-channels | awk -vORS="|" '/^[a-z]/{print $2}')
+subst="s/^php-(${subst%\|})-//"
+
+# clear it if you do not want to upgrade pkgs. i.e bring ac to sync
+do_upgrade=1
+#do_upgrade=
+
 for pkg in $(cat pear.pkgs); do
 	# check if there's update in channel
-	pearpkg=${pkg#php-pear-}
+	pearpkg=$(echo "$pkg" | sed -re "$subst")
 	ver=$(awk -vpkg=$pearpkg '$2 == pkg {print $5}' pear.upgrades)
 	[ "$ver" ] || continue
 
@@ -53,7 +60,7 @@ for pkg in $(cat pear.pkgs); do
 
 	# try upgrading with specified version
 	# pldnotify.awk uses "pear remote-info" which does not respect preferred package states
-	./builder -bb -u $pkg --upgrade-version $ver --define "_unpackaged_files_terminate_build 1" || {
+	./builder -bb $pkg ${do_upgrade:+-u --upgrade-version $ver} --define "_unpackaged_files_terminate_build 1" || {
 		cat >&2 <<-EOF
 
 		$pkg failed