Fix patching

1 files changed, 14 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index ab4a48074bba..d5b934ebb307 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -28,11 +28,10 @@ source_x86_64=("http://us.download.nvidia.com/XFree86/Linux-x86_64/$pkgver/NVIDI
 md5sums_i686=('c91760a04f658845722380f6c7fd4709')
 md5sums_x86_64=('4eea308a1b04553f720f82fd2fac79d3')
 
-# Auto-detect patches
-_patches=($(ls *.patch 2>/dev/null))
-for _patch in ${_patches[@]}; do
-    source+=("$_patch")
-    md5sums+=('SKIP')
+# Auto-detect patches (e.g. nvidia-linux-4.1.patch)
+for _patch in $(ls "$startdir"/*.patch 2>/dev/null); do
+  source+=("$_patch")
+  md5sums+=('SKIP')
 done
 
 prepare() {
@@ -52,25 +51,22 @@ prepare() {
     cp -r kernel kernel-$_kernel
 
     # Patch?
-    if [[ $(ls "$srcdir"/*.patch 2>/dev/null) ]]; then
+    for _patch in $(ls "$srcdir"/*.patch 2>/dev/null); do
+      # Patch version
+      _major_patch=$(echo $_patch | grep -Po "\d+\.\d+")
+        
       # Cd in place
       cd kernel-$_kernel
 
-      # Loop all patches
-      for _patch in "$srcdir"/*.patch; do
-        # Patch version
-        _major_patch=$(echo $_patch | grep -Po "\d+\.\d+")
-        
-        # Check version
-        if (( $(vercmp $_kernel $_major_patch) >= 0 )); then
-          msg2 "Applying ${_patch##*/} for $_kernel..."
-          patch -p2 -i "$_patch"
-        fi
-      done
+      # Check version
+      if (( $(vercmp $_kernel $_major_patch) >= 0 )); then
+        msg2 "Applying ${_patch##*/} for $_kernel..."
+        patch -p2 -i "$_patch"
+      fi
       
       # Return
       cd ..
-    fi
+    done
   done
 }