install _bl variant, keyboard_brightness.sh

2 files changed, 14 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3f620e259ebf..2c96a73a6f5f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Wed Jan 20 07:11:37 UTC 2016
 pkgbase = chromebook_keyboard_backlight_driver
 	pkgdesc = Keyboard backlight driver for various chromebook models
-	pkgver = 1.0.r7.g7b8a863
-	pkgrel = 1
+	pkgver = 1.0.r7.7b8a863
+	pkgrel = 2
 	url = https://github.com/corcoran/chromebook_keyboard_backlight_driver
 	install = chromebook_keyboard_backlight_driver.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index 757c149ba5c8..c174607cb1b9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Poppy Schmo <poppyschmo at users dot noreply.github.com>
 pkgname=chromebook_keyboard_backlight_driver
-pkgver=1.0.r7.g7b8a863
-pkgrel=1
+pkgver=1.0.r7.7b8a863
+pkgrel=2
 epoch=
 pkgdesc="Keyboard backlight driver for various chromebook models"
 arch=('i686' 'x86_64')
@@ -17,8 +17,8 @@ md5sums=('SKIP')
 
 pkgver() {
 	cd ${srcdir}/${pkgname}
-	echo ${pkgrel}'.0.r'`git log --oneline | wc -l`'.'`git describe --all --long \
-		| awk -F '-' '{print $NF}'`
+	echo '1.0.r'$(git log --oneline | wc -l)'.'$( git log --oneline | \
+		awk 'NR == 1 {print $1}')
 }
 
 build() {
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-	local _excl='_bl' # don't install chromeos_keyboard_bl.ko variant
+	local _excl='_bl' # don't autoload chromeos_keyboard_bl.ko variant
 	local _shortr=$(uname -r \
 		| sed 's/\([0-9]\.[0-9]\+\)\.[0-9]\+-[0-9]\+\(-[A-Z]\+\)/\1\2/')
 	local _destd=${pkgdir}'/usr/lib/modules/extramodules-'"$_shortr"
@@ -37,13 +37,18 @@ package() {
 	cd ${srcdir}/${pkgname}
 	echo '# modules for' ${pkgname} > "$_conf"
 	for each in $(echo "*.ko"); do
-		if [[ $(file "$each") =~ BuildID && ! "$each" =~ "$_excl" ]] ; then
+		if [[ $(file "$each") =~ BuildID ]]; then
 			gzip --keep "$each"
 			[ -f "$each".gz ] && install -Dm 644 "$each".gz "$_destd"/"$each".gz
-			echo $(basename "$each" '.ko') >> "$_conf"
+			if [[ ! "$each" =~ "$_excl" ]]; then
+				echo $(basename "$each" '.ko') >> "$_conf"
+			else
+				echo '#'$(basename "$each" '.ko') >> "$_conf"
+			fi
 		fi
 	done
 	install -Dm 644 README.markdown "$_docd"/README.markdown
+	install -Dm 644 keyboard_brightness.sh "$_docd"/keyboard_brightness.sh
 	install -Dm 644 $_conf "$_confd"/"$_conf"
 }