diff options
author | Bastian Wissler | 2008-10-28 15:40:48 +0100 |
---|---|---|
committer | Bastian Wissler | 2008-10-28 15:40:48 +0100 |
commit | 4f0d34186352a7266e9f8f30e22bc98b82c7e5db (patch) | |
tree | 09f83cf3c5853299dc1473aa26b6d95202fa830a /os-plugins/plugins/xserver/files | |
parent | xserver: * fixed linkage.sh (diff) | |
download | core-4f0d34186352a7266e9f8f30e22bc98b82c7e5db.tar.gz core-4f0d34186352a7266e9f8f30e22bc98b82c7e5db.tar.xz core-4f0d34186352a7266e9f8f30e22bc98b82c7e5db.zip |
xserver: * better suse-gfx-install.sh -> now only downloaded, when needed
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2374 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'os-plugins/plugins/xserver/files')
-rwxr-xr-x | os-plugins/plugins/xserver/files/linkage.sh | 2 | ||||
-rwxr-xr-x | os-plugins/plugins/xserver/files/suse-gfx-install.sh | 12 |
2 files changed, 8 insertions, 6 deletions
diff --git a/os-plugins/plugins/xserver/files/linkage.sh b/os-plugins/plugins/xserver/files/linkage.sh index 2cb9d0a2..16b609bb 100755 --- a/os-plugins/plugins/xserver/files/linkage.sh +++ b/os-plugins/plugins/xserver/files/linkage.sh @@ -73,7 +73,7 @@ divert() { stripstr ${rlib} ${RR} divname=${VAL} - echo "${lib} ${rlib} ${divname} after stripping" + #echo "${lib} ${rlib} ${divname} after stripping" # divert, if exists if [ -e ${rlib} ]; then diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh index 7cc9b991..6299b584 100755 --- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh +++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh @@ -81,8 +81,9 @@ if [ "$1" = "nvidia" ]; then URLS=$(cat logfile | grep -P -o "http://.*?rpm " | sort -u | xargs) for RPM in $URLS; do RNAME=$(echo ${RPM} | sed -e 's,^.*/\(.*\)$,\1,g') - rm -rf ${RNAME} - wget ${RPM} 2>&1 > /dev/null + if [ ! -e ${RNAME} ]; then + wget ${RPM} > /dev/null + fi # We use rpm2cpio from suse to extract rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null done @@ -129,9 +130,10 @@ if [ "$1" = "ati" ]; then 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') - rm -rf ${RNAME} - wget ${RPM} 2>&1 > /dev/null - # We use rpm2cpio from suse to extract + if [ ! -e ${RNAME} ]; then + wget ${RPM} > /dev/null + fi + # We use rpm2cpio from suse to extract -> propably new rpm version rpm2cpio ${RNAME} | ${BUSYBOX} cpio -id > /dev/null done mv ./usr/X11R6/lib/* ./usr/lib/ |