Update PKGBUILD for better bash scripting

4 files changed, 45 insertions, 85 deletions

diff --git a/.AURINFO b/.AURINFO
deleted file mode 100644
index 3a13bd2f58c3..000000000000
--- a/.AURINFO
+++ /dev/null
@@ -1,68 +0,0 @@
-pkgbase = nvidia-fbcondecor
-	pkgdesc = NVIDIA drivers for linux-fbcondecor.
-	pkgver = 349.16
-	pkgrel = 2
-	url = http://www.nvidia.com/
-	install = nvidia-fbcondecor.install
-	arch = i686
-	arch = x86_64
-	license = custom
-	makedepends = linux-fbcondecor-headers>=4.0
-	makedepends = linux-fbcondecor-headers<4.1
-	depends = linux-fbcondecor>=4.0
-	depends = linux-fbcondecor<4.1
-	depends = nvidia-libgl
-	depends = nvidia-utils=349.16
-	conflicts = nvidia-340xx-ck
-	conflicts = nvidia-304xx-ck
-	conflicts = nvidia-275xx-ck
-	conflicts = nvidia-319-ck
-	conflicts = nvidia-96xx-ck
-	conflicts = nvidia-beta-ck
-	conflicts = nvidia-ck
-	conflicts = nvidia-ck-atom
-	conflicts = nvidia-ck-barcelona
-	conflicts = nvidia-ck-bulldozer
-	conflicts = nvidia-ck-corex
-	conflicts = nvidia-ck-core2
-	conflicts = nvidia-ck-haswell
-	conflicts = nvidia-ck-ivybridge
-	conflicts = nvidia-ck-kx
-	conflicts = nvidia-ck-k10
-	conflicts = nvidia-ck-nehalem
-	conflicts = nvidia-ck-p4
-	conflicts = nvidia-ck-piledriver
-	conflicts = nvidia-ck-pentm
-	conflicts = nvidia-ck-sandybridge
-	conflicts = nvidia-304xx-ck-atom
-	conflicts = nvidia-304xx-ck-barcelona
-	conflicts = nvidia-304xx-ck-corex
-	conflicts = nvidia-304xx-ck-core2
-	conflicts = nvidia-304xx-ck-haswell
-	conflicts = nvidia-304xx-ck-ivybridge
-	conflicts = nvidia-304xx-ck-kx
-	conflicts = nvidia-304xx-ck-k10
-	conflicts = nvidia-304xx-ck-nehalem
-	conflicts = nvidia-304xx-ck-p4
-	conflicts = nvidia-304xx-ck-piledriver
-	conflicts = nvidia-304xx-ck-pentm
-	conflicts = nvidia-304xx-ck-sandybridge
-	conflicts = nvidia-340xx-ck-atom
-	conflicts = nvidia-340xx-ck-barcelona
-	conflicts = nvidia-340xx-ck-bulldozer
-	conflicts = nvidia-340xx-ck-core2
-	conflicts = nvidia-340xx-ck-haswell
-	conflicts = nvidia-340xx-ck-ivybridge
-	conflicts = nvidia-340xx-ck-kx
-	conflicts = nvidia-340xx-ck-k10
-	conflicts = nvidia-340xx-ck-nehalem
-	conflicts = nvidia-340xx-ck-p4
-	conflicts = nvidia-340xx-ck-piledriver
-	conflicts = nvidia-340xx-ck-pentm
-	conflicts = nvidia-340xx-ck-sandybridge
-	source = ftp://download.nvidia.com/XFree86/Linux-x86/349.16/NVIDIA-Linux-x86-349.16.run
-	source = ftp://download.nvidia.com/XFree86/Linux-x86_64/349.16/NVIDIA-Linux-x86_64-349.16-no-compat32.run
-	options = !strip
-
-pkgname = nvidia-fbcondecor
-
diff --git a/.SRCINFO b/.SRCINFO
index 59d6bb3f5db8..6b08513c2e53 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,10 +7,8 @@ pkgbase = nvidia-fbcondecor
 	arch = i686
 	arch = x86_64
 	license = custom
-	makedepends = linux-fbcondecor-headers>=4.1
-	makedepends = linux-fbcondecor-headers<4.2
-	depends = linux-fbcondecor>=4.1
-	depends = linux-fbcondecor<4.2
+	makedepends = linux-fbcondecor-headers
+	depends = linux-fbcondecor
 	depends = nvidia-libgl
 	depends = nvidia-utils=355.06
 	conflicts = nvidia-340xx-ck
@@ -63,8 +61,8 @@ pkgbase = nvidia-fbcondecor
 	options = !strip
 	source = ftp://download.nvidia.com/XFree86/Linux-x86/355.06/NVIDIA-Linux-x86-355.06.run
 	source = ftp://download.nvidia.com/XFree86/Linux-x86_64/355.06/NVIDIA-Linux-x86_64-355.06-no-compat32.run
-	md5sums = 59597d5dfaaf0fc83a5e78d29a97ccac
-	md5sums = 3e04208affde8c35a8b96975eec0486b
+	md5sums = c4d2ae0dd6338874e5e8358fe630ba8f
+	md5sums = 8bdf64adc94bd9e170e4a7412ca9e5ba
 
 pkgname = nvidia-fbcondecor
 
diff --git a/PKGBUILD b/PKGBUILD
index 8fa0be6a8320..01680b4b5445 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,8 +10,8 @@ pkgrel=1
 pkgdesc="NVIDIA drivers for linux-fbcondecor."
 arch=('i686' 'x86_64')
 url="http://www.nvidia.com/"
-depends=('linux-fbcondecor>=4.1' 'linux-fbcondecor<4.2' "nvidia-libgl" "nvidia-utils=${pkgver}")
-makedepends=('linux-fbcondecor-headers>=4.1' 'linux-fbcondecor-headers<4.2')
+depends=('linux-fbcondecor' "nvidia-libgl" "nvidia-utils=${pkgver}")
+makedepends=('linux-fbcondecor-headers')
 conflicts=('nvidia-340xx-ck' 'nvidia-304xx-ck' 'nvidia-275xx-ck' 'nvidia-319-ck' 'nvidia-96xx-ck' 'nvidia-beta-ck' 'nvidia-ck' 'nvidia-ck-atom' 'nvidia-ck-barcelona' 'nvidia-ck-bulldozer' 'nvidia-ck-corex' 'nvidia-ck-core2' 'nvidia-ck-haswell' 'nvidia-ck-ivybridge' 'nvidia-ck-kx' 'nvidia-ck-k10' 'nvidia-ck-nehalem' 'nvidia-ck-p4' 'nvidia-ck-piledriver' 'nvidia-ck-pentm' 'nvidia-ck-sandybridge' 'nvidia-304xx-ck-atom' 'nvidia-304xx-ck-barcelona' 'nvidia-304xx-ck-corex' 'nvidia-304xx-ck-core2' 'nvidia-304xx-ck-haswell' 'nvidia-304xx-ck-ivybridge' 'nvidia-304xx-ck-kx' 'nvidia-304xx-ck-k10' 'nvidia-304xx-ck-nehalem' 'nvidia-304xx-ck-p4' 'nvidia-304xx-ck-piledriver' 'nvidia-304xx-ck-pentm' 'nvidia-304xx-ck-sandybridge' 'nvidia-340xx-ck-atom' 'nvidia-340xx-ck-barcelona' 'nvidia-340xx-ck-bulldozer' 'nvidia-340xx-ck-core2' 'nvidia-340xx-ck-haswell' 'nvidia-340xx-ck-ivybridge' 'nvidia-340xx-ck-kx' 'nvidia-340xx-ck-k10' 'nvidia-340xx-ck-nehalem' 'nvidia-340xx-ck-p4' 'nvidia-340xx-ck-piledriver' 'nvidia-340xx-ck-pentm' 'nvidia-340xx-ck-sandybridge')
 # conflicts=('nvidia-96xx' 'nvidia-173xx')
 #groups=('ck-generic')
@@ -21,8 +21,8 @@ install=nvidia-fbcondecor.install
 options=(!strip)
 source=("ftp://download.nvidia.com/XFree86/Linux-x86/${pkgver}/NVIDIA-Linux-x86-${pkgver}.run"
         "ftp://download.nvidia.com/XFree86/Linux-x86_64/${pkgver}/NVIDIA-Linux-x86_64-${pkgver}-no-compat32.run")
-md5sums=('59597d5dfaaf0fc83a5e78d29a97ccac'
-         '3e04208affde8c35a8b96975eec0486b')
+md5sums=('c4d2ae0dd6338874e5e8358fe630ba8f'
+         '8bdf64adc94bd9e170e4a7412ca9e5ba')
 
 [[ "$CARCH" = "i686" ]] && _pkg="NVIDIA-Linux-x86-${pkgver}"
 [[ "$CARCH" = "x86_64" ]] && _pkg="NVIDIA-Linux-x86_64-${pkgver}-no-compat32"
diff --git a/nvidia-fbcondecor.install b/nvidia-fbcondecor.install
index 593e3a520922..acdc6e9954fe 100755
--- a/nvidia-fbcondecor.install
+++ b/nvidia-fbcondecor.install
@@ -1,15 +1,45 @@
+_depmod() {
+    _extramodules='extramodules-4.1-fbcondecor'
+
+    # Update module dependencies
+    depmod $(cat /usr/lib/modules/$_extramodules/version)
+}
+
+_rmmod() {
+    # Try unloading
+    if lsmod | grep -q nvidia; then
+        rmmod nvidia
+    fi
+
+    # What?
+    if [[ $? != 0 ]]; then
+        # X running?
+        if pidof Xorg >/dev/null; then
+            echo ":: Please reboot or exit X first."
+        fi
+    fi
+}
+
 post_install() {
-	EXTRAMODULES='extramodules-4.0-fbcondecor'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-	echo 'In order to use nvidia module, reboot the system.'
+    _depmod
+
+    # X running?
+    if pidof Xorg >/dev/null; then
+        echo ":: Please reboot or exit X to unload the current module."
+    fi
 }
 
 post_upgrade() {
-	EXTRAMODULES='extramodules-4.0-fbcondecor'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    _depmod
+
+    # Not rebuilding?
+    if (( $(vercmp $1 $2) != 0 )); then
+        _rmmod
+    fi
 }
 
 post_remove() {
-	EXTRAMODULES='extramodules-4.0-fbcondecor'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+    _depmod
+
+    _rmmod
 }