From: Elan Ruusamäe <glen@pld-linux.org>
Date: Mon, 15 Nov 2010 14:52:11 +0000 (+0000)
Subject: - check tools early (php, pear)
X-Git-Tag: auto/th/rpm-build-tools-4.5-5~7^2~30
X-Git-Url: http://git.pld-linux.org/?p=packages%2Frpm-build-tools.git;a=commitdiff_plain;h=014c89d7bbe1f5e3868b1a656a094b0cd9d8fbab;hp=c6d96c51da498632c9c8b4959d2ca3107915d6c6

- check tools early (php, pear)

Changed files:
    pear-autoup.sh -> 1.11
---

diff --git a/pear-autoup.sh b/pear-autoup.sh
index 1489631..801dfa3 100644
--- a/pear-autoup.sh
+++ b/pear-autoup.sh
@@ -7,7 +7,13 @@
 
 set -e
 
-[ -s pear.ls ] || poldek -q -Q --skip-installed --cmd 'ls php-pear-*' > pear.ls
+# test that php is working
+php -r 'echo "PHP is working OK\n";'
+
+# test that pear is working
+pear info PEAR >/dev/null
+
+[ -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"
@@ -32,9 +38,6 @@ set -e
 }
 [ -s pear.upgrades ] || pear list-upgrades > pear.upgrades
 
-# test that php is working
-php -r 'echo "PHP is working OK\n";'
-
 for pkg in $(cat pear.pkgs); do
 	# check if there's update in channel
 	pearpkg=${pkg#php-pear-}