- filter pkgs list before installing

Changed files:
    pear-autoup.sh -> 1.6

diff --git a/pear-autoup.sh b/pear-autoup.sh
index 3faeef54c57116ff64d76a741236adde7778c7da..6f50fcee76e19aab2d749fb4a788977916a967a8 100644 (file)
--- a/pear-autoup.sh
+++ b/pear-autoup.sh
@@ -8,18 +8,21 @@
 set -e
 
 [ -s pear.ls ] || poldek -q --skip-installed --cmd 'ls php-pear-* | desc' > pear.ls
-[ -s pear.pkgs ] || awk '/^Source.package:/{print $3}' < pear.ls | sort -u | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' > pear.pkgs
+[ -s pear.pkgs ] || {
+       awk '/^Source.package:/{print $3}' < pear.ls | sort -u | sed -re 's,-[^-]+-[^-]+.src.rpm$,,' > pear.pkgs
+
+       # filter out tests, see https://bugs.launchpad.net/poldek/+bug/620362
+       sed -i -e '/-tests/d' pear.pkgs
+       # more packages affected
+       sed -i -e '/php-pear-Auth_Container_ADOdb/d' pear.pkgs
+       sed -i -e '/php-pear-DB_DataObject-cli/d' pear.pkgs
+       # not pear pkg
+       sed -i -e '/^php-pear$/d' pear.pkgs
+}
+
 [ -f pear.installed ] || { sudo poldek  --update --upa; sed -e 's,^,install ,' pear.pkgs | sudo poldek; touch pear.installed; }
 [ -s pear.upgrades ] || pear list-upgrades > pear.upgrades
 
-# filter out tests, see https://bugs.launchpad.net/poldek/+bug/620362
-sed -i -e '/-tests/d' pear.pkgs
-# more packages affected
-sed -i -e '/php-pear-Auth_Container_ADOdb/d' pear.pkgs
-sed -i -e '/php-pear-DB_DataObject-cli/d' pear.pkgs
-# not pear pkg
-sed -i -e '/^php-pear$/d' pear.pkgs
-
 # test that php is working
 php -r 'echo "ok\n";'