From b538c1b3327e0b09151c3545f819e39dc6fd1931 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 16 Nov 2010 14:34:04 +0000 Subject: [PATCH] - depend on fixed poldek src info - workaround another poldek sillyness Changed files: pear-autoup.sh -> 1.14 --- pear-autoup.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pear-autoup.sh b/pear-autoup.sh index 966fc23..bffb0ab 100644 --- a/pear-autoup.sh +++ b/pear-autoup.sh @@ -16,12 +16,7 @@ pear info PEAR >/dev/null # needed pkgs for upgrade test rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging -[ -s pear.ls ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'ls php-pear-*' > pear.ls; } -[ -s pear.desc ] || { - for pkg in $(cat pear.ls); do - poldek -q --skip-installed --cmd "desc $pkg" - done -} > pear.desc +[ -s pear.desc ] || { poldek --upa; poldek -q -Q --skip-installed --cmd 'desc php-pear-*' > pear.desc; } [ -s pear.pkgs ] || { awk '/^Source.package:/{print $3}' < pear.desc | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' | sort -u > pear.pkgs @@ -36,7 +31,13 @@ rpm -q php-packagexml2cl php-pear-PEAR_Command_Packaging [ -f pear.installed ] || { sudo poldek --update --upa + # as sudo & poldek don't allow us to capture (no pipe or redirection work), + # we create markers which we could grab when invoked via "script" + echo "BEGIN INSTALL PACKAGES" sed -e 's,^,install ,' pear.pkgs | sudo poldek + echo "END INSTALL PACKAGES" + # rm -f pear.installed && script -c ./pear-autoup.sh pear.install.log + # sed -ne '/BEGIN INSTALL PACKAGES/,/END INSTALL PACKAGES/p' pear.install.log | grep -vE 'poldek:/.*install|: ambiguous name|equal version installed, skipped|Nothing to do' | less touch pear.installed } [ -s pear.upgrades ] || pear list-upgrades > pear.upgrades -- 2.44.0