From fbdc197bde0dd38ae00a84f20490dd3155db716a Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 8 Mar 2005 14:48:37 +0000 Subject: [PATCH] INTEGRATION: CWS sysui05 (1.6.10); FILE MERGED 2005/03/01 13:03:49 obr 1.6.10.2: RESYNC: (1.6-1.7); FILE MERGED 2005/02/28 12:56:31 obr 1.6.10.1: #120027# don't use external packages in >>requires<< --- setup_native/scripts/install_linux.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index 03c8763c88e0..7face6a570e4 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -86,11 +86,8 @@ fi # check for /bin/rpm first, otherwise the rpm database is most likly empty anyway if [ -x /bin/rpm ] then - /bin/rpm -q gnome-vfs2 >/dev/null - if [ $? -eq 0 ] - then - GNOMERPM=`find $PACKAGE_PATH -type f -name "*.rpm" -name "*-gnome*" -print` - fi + GNOMERPM=`find $PACKAGE_PATH -type f -name "*.rpm" -name "*-gnome*" -print` + /bin/rpm -i --test $GNOMERPM $CORERPM 2>/dev/null || GNOMERPM="" fi echo "Packages found:"