[Pkg-dkms-commits] [SCM] Maintenance of the dkms package branch, master, updated. upstream/2.0.20.4-37-g9f82230

[David Paleino]

The following commit has been merged in the master branch:
commit 9f8223068dcb6b36e65fa44fe8dea1f05a5dc42b
Author: David Paleino <d.paleino at gmail.com>
Date:   Tue Dec 30 16:46:56 2008 +0100

    Fixing patch for bash-completion

diff --git a/debian/patches/11-bash-completion.patch b/debian/patches/11-bash-completion.patch
index ad75395..60bc8a1 100644
--- a/debian/patches/11-bash-completion.patch
+++ b/debian/patches/11-bash-completion.patch
@@ -1,27 +1,28 @@
---- a/dkms.bash-completion
-+++ b/dkms.bash-completion
-@@ -8,6 +8,20 @@ _kernels()
-         COMPREPLY=( $( command ls /lib/modules | grep "^$cur" ) )
- }
- 
+--- dkms.orig/dkms.bash-completion
++++ dkms/dkms.bash-completion
+@@ -5,7 +5,20 @@
+ #
+ _kernels()
+ {
+-        COMPREPLY=( $( command ls /lib/modules | grep "^$cur" ) )
++        COMPREPLY=( $( cd /lib/modules && compgen -d -- "$cur" ) )
++}
++
 +# complete on full directory names under $1
 +_subdirectories()
 +{
-+	COMPREPLY=( $( command ls -F $1 2>/dev/null | awk -F \/ '/\/$/ \
-+		{print $1}' | grep "^$cur" ) )
++	COMPREPLY=( $( cd $1 && compgen -d -- "$cur" ) )
 +}
 +
 +# complete on $2 part of filenames matching pattern $1 under /usr/src
 +_filename_parts()
 +{
-+	COMPREPLY=( $( command ls -F /usr/src 2>/dev/null | grep -E '^'$1'/$' \
++	COMPREPLY=( $( command ls -F /usr/src/ 2>/dev/null | grep -E '^'$1'/$' \
 +		| sed -r -e 's/^([^-]+)-(.+)\/$/\'$2'/' | grep "^$cur" ) )
-+}
-+
+ }
+ 
  _dkms()
- {
- 	local cur prev command module i
-@@ -22,9 +36,14 @@ _dkms()
+@@ -22,9 +35,14 @@
  	else
  
  		prev=${COMP_WORDS[COMP_CWORD-1]}
@@ -37,7 +38,7 @@
  				return 0
  				;;
  			-v)
-@@ -35,7 +54,11 @@ _dkms()
+@@ -35,7 +53,11 @@
  					fi
  				done
  				if [ -n "$module" ]; then
@@ -50,7 +51,7 @@
  					return 0
  				fi
  				;;
-@@ -53,7 +76,6 @@ _dkms()
+@@ -53,7 +75,6 @@
  				;;
  		esac
  

-- 
Maintenance of the dkms package