From cdbe310c8037e787de4a384b41ad9a13c6aed6d4 Mon Sep 17 00:00:00 2001
From: Bastian Wissler
Date: Tue, 2 Dec 2008 17:27:13 +0000
Subject: xserver plugin: * make installation less verbose

git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2395 95ad53e4-c205-0410-b2fa-d234c58c8868
---
 os-plugins/plugins/xserver/files/suse-gfx-install.sh | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'os-plugins/plugins/xserver/files/suse-gfx-install.sh')

diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
index 6299b584..e50aa277 100755
--- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh
+++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh
@@ -70,22 +70,19 @@ if [ "$1" = "nvidia" ]; then
   if [ "11.0" = "`cat /etc/SuSE-release | tail -n1 | cut -d' ' -f3`" ]; then
     echo "  * Downloading nvidia rpm packages... this could take some time..."
     # add repository for nvidia drivers
-    zypper addrepo http://download.nvidia.com/opensuse/11.0/ NVIDIA
-    # confirm authenticity of key (once) 
-    # -> After key is cached, this is obsolete
-    zypper se -r NVIDIA x11-video-nvidiaG01
+    zypper --no-gpg-checks addrepo http://download.nvidia.com/opensuse/11.0/ NVIDIA > /dev/null 2>&1
     # get URLs by virtually installing nvidia-OpenGL driver
-    zypper -n -vv install -D x11-video-nvidiaG01 > logfile
+    zypper --no-gpg-checks -n -vv install -D x11-video-nvidiaG01 2>&1 > logfile
 
     # take unique urls from logfile
     URLS=$(cat logfile |  grep -P -o "http://.*?rpm " | sort -u | xargs)
     for RPM in $URLS; do
       RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g')
       if [ ! -e ${RNAME} ]; then
-        wget ${RPM} > /dev/null
+        wget ${RPM} > /dev/null 2>&1
       fi
       # We use rpm2cpio from suse to extract
-      rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null
+      rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null 2>&1
     done
     mv ./usr/X11R6/lib/* ./usr/lib/
     mv ./usr ..
@@ -119,19 +116,16 @@ if [ "$1" = "ati" ]; then
     echo "  * Downloading ati rpm packages... this could take some time..."
 
      # add repository for nvidia drivers
-    zypper addrepo http://www2.ati.com/suse/11.0/ ATI
-    # confirm authenticity of key (once) 
-    # -> After key is cached, this is obsolete
-    zypper se -r ATI x11-video-fglrxG01
+    zypper --no-gpg-checks addrepo http://www2.ati.com/suse/11.0/ ATI > /dev/null 2>&1 
     # get URLs by virtually installing fglrx-OpenGL driver
-    zypper -n -vv install -D ati-fglrxG01-kmp${KSUFFIX} x11-video-fglrxG01 > logfile
+    zypper --no-gpg-checks -n -vv install -D ati-fglrxG01-kmp${KSUFFIX} x11-video-fglrxG01 > logfile
 
     # take unique urls from logfile
     URLS=$(cat logfile |  grep -P -o "http://.*?rpm " | grep fglrx | sort -u | xargs)
     for RPM in $URLS; do
       RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g')
       if [ ! -e ${RNAME} ]; then
-        wget ${RPM} > /dev/null
+        wget ${RPM} > /dev/null 2>&1 
       fi
       # We use rpm2cpio from suse to extract -> propably new rpm version
       rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null
-- 
cgit v1.2.3-55-g7522