From 708947a7fd576718a994dda6d9f3ba9ec8578c77 Mon Sep 17 00:00:00 2001
From: Heinz Wiesinger <pprkut@slackbuilds.org>
Date: Sun, 4 Jul 2021 15:59:59 +0200
Subject: system/nvidia-driver: Fix support for PRINT_PACKAGE_NAME

Signed-off-by: Heinz Wiesinger <pprkut@slackbuilds.org>
---
 system/nvidia-driver/nvidia-driver.SlackBuild | 40 +++++++++++++--------------
 1 file changed, 20 insertions(+), 20 deletions(-)

(limited to 'system/nvidia-driver')

diff --git a/system/nvidia-driver/nvidia-driver.SlackBuild b/system/nvidia-driver/nvidia-driver.SlackBuild
index d90cf723d3c3..9f28f19a49a1 100644
--- a/system/nvidia-driver/nvidia-driver.SlackBuild
+++ b/system/nvidia-driver/nvidia-driver.SlackBuild
@@ -44,18 +44,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
-if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
-  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
-  exit 0
-fi
-
-TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}
-
 if [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   TARGET="x86_64"
@@ -67,6 +55,26 @@ else
   exit 1
 fi
 
+if [ "${COMPAT32}" = "yes" ]; then
+    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
+    MULTI="_multilib"
+else
+    COMP32="--no-install-compat32-libs"
+    MULTI=""
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION$MULTI-$TARGET-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
+TMP=${TMP:-/tmp/SBo}
+PKG=$TMP/package-$PRGNAM
+OUTPUT=${OUTPUT:-/tmp}
+
 # There are a couple of unresolved issues with nvidia-installer, so we
 # abort if an Nvidia driver is still installed:
 if [ -x /usr/bin/nvidia-installer ]; then
@@ -140,14 +148,6 @@ cd -
 mv -f $PKG/usr/bin/nvidia-installer $TMP/$SRCNAM
 mv -f $PKG/usr/man/man1/nvidia-installer.1.gz $TMP/$SRCNAM
 
-if [ "${COMPAT32}" = "yes" ]; then
-    COMP32="--install-compat32-libs --compat32-prefix=$PKG/usr"
-    MULTI="_multilib"
-else
-    COMP32="--no-install-compat32-libs"
-    MULTI=""
-fi
-
 # Install the binary libs using nvidia-installer compiled above
 cd $TMP/$SRCNAM
 ./nvidia-installer -s --no-kernel-module --no-drm --no-unified-memory \
-- 
cgit v1.2.3