diff options
author | Bastian Wissler | 2009-04-27 18:10:19 +0200 |
---|---|---|
committer | Bastian Wissler | 2009-04-27 18:10:19 +0200 |
commit | daeaa52246816acb9dcccb28588ceec94e640eea (patch) | |
tree | 2f482ea388d7507351b5f3034efc9503e39bd0af | |
parent | bug: var serial/parallel not defined (diff) | |
download | core-daeaa52246816acb9dcccb28588ceec94e640eea.tar.gz core-daeaa52246816acb9dcccb28588ceec94e640eea.tar.xz core-daeaa52246816acb9dcccb28588ceec94e640eea.zip |
xserver plugin:
* added some tests to prevent warnings
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2830 95ad53e4-c205-0410-b2fa-d234c58c8868
-rwxr-xr-x | os-plugins/plugins/xserver/files/suse-gfx-install.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/os-plugins/plugins/xserver/files/suse-gfx-install.sh b/os-plugins/plugins/xserver/files/suse-gfx-install.sh index 347c1a32..ac6713fb 100755 --- a/os-plugins/plugins/xserver/files/suse-gfx-install.sh +++ b/os-plugins/plugins/xserver/files/suse-gfx-install.sh @@ -184,7 +184,9 @@ if [ "$1" = "nvidia" ]; then rpm2cpio ${RNAME} | cpio -id > /dev/null 2>&1 fi done - mv ./usr/X11R6/lib/* ./usr/lib/ + if [ -d ./usr/X11R6/lib ]; then + mv ./usr/X11R6/lib/* ./usr/lib/ + fi if [ $(find ./usr/ -name *.so* 2>/dev/null | wc -l ) -eq 0 ]; then echo " NVIDIA files failed to install via zypper!!" exit @@ -238,10 +240,12 @@ if [ "$1" = "ati" ]; then rpm2cpio ${RPM} 2>/dev/null | cpio -id >/dev/null 2>&1 - mv ./usr/X11R6/lib/* ./usr/lib/ - if [ -d etc ]; then - cp -r etc/* /etc/ - fi + if [ -d ./usr/X11R6/lib ]; then + mv ./usr/X11R6/lib/* ./usr/lib/ + fi + if [ -d etc ]; then + cp -r etc/* /etc/ + fi # cleanup rm -rf ${RPM} @@ -289,7 +293,9 @@ if [ "$1" = "ati" ]; then fi done - mv ./usr/X11R6/lib/* ./usr/lib/ > /dev/null 2>&1 + if [ -d ./usr/X11R6/lib ]; then + mv ./usr/X11R6/lib/* ./usr/lib/ > /dev/null 2>&1 + fi if [ $(find ./usr/ -name *.so* 2>/dev/null | wc -l ) -eq 0 ]; then echo " ATI files failed to install via zypper!!" exit |