summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2016-06-14 13:18:54 +0100
committerRobby Workman <rworkman@slackbuilds.org>2016-06-18 19:14:15 -0500
commit6aba8faef12d1256309f650b68bcef88858c124c (patch)
tree81c2bfd072c353263c3c0f93d3ba30e0d68687bb
parent1f0bd114b7820aac9e05aef664a134d9ad67df18 (diff)
downloadslackbuilds-6aba8faef12d1256309f650b68bcef88858c124c.tar.gz
system/nvidia-driver: Fix install with ROOT=.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--system/nvidia-driver/doinst.sh5
-rw-r--r--system/nvidia-driver/nvidia-switch2
2 files changed, 4 insertions, 3 deletions
diff --git a/system/nvidia-driver/doinst.sh b/system/nvidia-driver/doinst.sh
index 13f101c5be..8ee62f049e 100644
--- a/system/nvidia-driver/doinst.sh
+++ b/system/nvidia-driver/doinst.sh
@@ -1,5 +1,6 @@
if [ -x /usr/bin/update-desktop-database ]; then
- ./usr/bin/update-desktop-database -q usr/share/applications
+ /usr/bin/update-desktop-database -q usr/share/applications
fi
-/usr/sbin/nvidia-switch --install
+./usr/sbin/nvidia-switch --install
+
diff --git a/system/nvidia-driver/nvidia-switch b/system/nvidia-driver/nvidia-switch
index 640bfd4b23..a657f5a52c 100644
--- a/system/nvidia-driver/nvidia-switch
+++ b/system/nvidia-driver/nvidia-switch
@@ -30,7 +30,7 @@
set -e
-ROOT="/"
+ROOT="${ROOT:-/}"
CWD=$(pwd)
LIBSUFFIX="LIBDIRSUFFIX" # This will be replaced in the build script
COMPAT32="LIB32FLAG" # This will be replaced in the build script (yes | no)