[Lunar-commits] <moonbase> NVIDIA: make it fail to install if X was running during it.

[Florin Braescu]

commit 8ddcda032fd3db069a8ae38060e8dbdbcdfeb337
Author: Florin Braescu <florin at lunar-linux.org>
Date:   Thu Feb 18 07:11:24 2010 +0200

    NVIDIA: make it fail to install if X was running during it.
    
    Submitted by Paul Bredbury (brebs). Thank You.
---
 x11/NVIDIA/BUILD |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/x11/NVIDIA/BUILD b/x11/NVIDIA/BUILD
index 7ab657f..17c6957 100644
--- a/x11/NVIDIA/BUILD
+++ b/x11/NVIDIA/BUILD
@@ -34,7 +34,7 @@
 
   # We need to fool the installer a little as it checks for the
   # libraries after the installation
-  export LD_LIBRARY_PATH="/usr/lib/opengl/nvidia" 
+  export LD_LIBRARY_PATH="/usr/lib/opengl/nvidia" &&
 
   ./nvidia-installer --silent \
                      --no-precompiled-interface \
@@ -50,12 +50,12 @@
   rm -f /etc/X11/XvMCConfig &&
   touch /etc/X11/XvMCConfig &&
   echo libXvMCNVIDIA_dynamic.so.1 > /etc/X11/XvMCConfig &&
-  chmod 644 /etc/X11/XvMCConfig
+  chmod 644 /etc/X11/XvMCConfig &&
 
   # Get a sane default if haven't set it yet
   if [ "x$LUNAR_GL" == "x" ] ; then
     set_local_config LUNAR_GL binary
-  fi
+  fi &&
 
   # This is a temp workaround for braindead dlopen calls inside the NVIDIA
   # libglx.so
@@ -64,7 +64,7 @@
          /usr/lib/libGLcore.so.1 &&
 
   ln -sf /usr/lib/opengl/nvidia/tls/libnvidia-tls.so.1 \
-         /usr/lib/libnvidia-tls.so.1
+         /usr/lib/libnvidia-tls.so.1 &&
 
   if !( module_installed gtk+-2 ); then
     rm -f /usr/bin/nvidia-settings