bump version number

3 files changed, 55 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61b6ed1b5637..1aaca2633488 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = chromebook_keyboard_backlight_driver
 	pkgdesc = Keyboard backlight driver for various chromebook models
-	pkgver = 1.0.r9.fa4f860
-	pkgrel = 4
+	pkgver = 1.0r14.g86bac41
+	pkgrel = 1
 	url = https://github.com/corcoran/chromebook_keyboard_backlight_driver
 	install = chromebook_keyboard_backlight_driver.install
 	arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index b52fbc616625..af86ecf32db4 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.r9.fa4f860
-pkgrel=4
+pkgver=1.0r14.g86bac41
+pkgrel=1
 epoch=
 pkgdesc="Keyboard backlight driver for various chromebook models"
 arch=('i686' 'x86_64')
@@ -16,41 +16,49 @@ source=("git://github.com/corcoran/chromebook_keyboard_backlight_driver.git")
 md5sums=('SKIP')
 
 pkgver() {
-	cd ${srcdir}/${pkgname}
-	echo '1.0.r'$(git log --oneline | wc -l)'.'$( git log --oneline | \
-		awk 'NR == 1 {print $1}')
+	cd "${srcdir}/${pkgname}"
+	printf "1.0r%s.g%s" "$(git rev-list --count HEAD)" "$(git describe --always)"
 }
 
 build() {
-	cd ${srcdir}/${pkgname}
+	cd "${srcdir}/${pkgname}"
 	make
 }
 
 package() {
-	local _excl='_bl' # don't autoload chromeos_keyboard_bl.ko variant
-	local _confd=${pkgdir}'/etc/modules-load.d'
-	local _conf='chromebook_keyboard_backlight_driver.conf'
-	local _docd=${pkgdir}'/usr/share/doc/'${pkgname}
-	cd ${srcdir}/${pkgname}
+	local _excl _confd _conf _docd _newest each tdir
+	_excl=_bl # don't autoload chromeos_keyboard_bl.ko variant
+	_confd=$pkgdir/etc/modules-load.d
+	_conf=chromebook_keyboard_backlight_driver.conf
+	_docd=$pkgdir/usr/share/doc/$pkgname
+	_newest=
+	_multi=$pkgdir/multi-kernel.install
+	echo "# Run as sudo to enable driver for multiple kernels" > "$_multi"
+	cd "$srcdir/$pkgname"
 	echo '# modules for' ${pkgname} > "$_conf"
-	for each in $(echo "*.ko"); do
-		if [[ $(file "$each") =~ BuildID ]]; then
-			gzip --keep "$each"
-			for tdir in $(echo /usr/lib/modules/extramodules*); do
-				# not sure if setting nullglob allowed, so test -d instead:
-				[[ -f "$each".gz && -d "$tdir" ]] &&
-					install -Dm 644 "$each".gz ${pkgdir}/${tdir}/${each}.gz
-			done && unset tdir
-			if [[ ! "$each" =~ "$_excl" ]]; then
-				echo $(basename "$each" '.ko') >> "$_conf"
+	for each in *.ko; do
+		if [[ $(file "$each") != *BuildID* ]]; then
+			continue
+		fi
+		gzip --keep "$each"
+		for tdir in $(ls -d /usr/lib/modules/extramodules* | sort -Vr); do
+			[[ ! -f "$each.gz" || ! -d "$tdir" ]] && continue
+			if [[ -z "$_newest" || $_newest == "$tdir" ]]; then
+				install -Dm 644 "$each.gz" "$pkgdir/$tdir/$each.gz"
+				_newest=$tdir
 			else
-				echo '#'$(basename "$each" '.ko') >> "$_conf"
+				echo "ln -s $_newest/$each ..$tdir" >> "$_multi"
 			fi
+		done
+		if [[ ! $each == *"$_excl"* ]]; then
+			basename "$each" '.ko' >> "$_conf"
+		else
+			echo "#$(basename "$each" '.ko')" >> "$_conf"
 		fi
-	done && unset each
-	install -Dm 644 README.markdown "$_docd"/README.markdown
-	install -Dm 644 keyboard_brightness.sh "$_docd"/keyboard_brightness.sh
-	install -Dm 644 $_conf "$_confd"/"$_conf"
+	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"
 }
 
-# vim:ts=4:sw=4:sts=4:ft=sh:noet:list:
+# vim:noet:list:ft=sh
diff --git a/chromebook_keyboard_backlight_driver.install b/chromebook_keyboard_backlight_driver.install
index eec2996a1fbe..a8e35a73ead6 100644
--- a/chromebook_keyboard_backlight_driver.install
+++ b/chromebook_keyboard_backlight_driver.install
@@ -1,24 +1,32 @@
 
 _spit() {
-	local _zero="$(tput sgr0)"
-	local _bd=${_zero}"$(tput bold)"
-	local _bl="$(tput setaf 4)"
-	local _yl=${_bd}"$(tput setaf 3)"
-	if (( "$#" == 2 )); then
-		echo ${_bl}'=>'${_yl} "$1"':'${_bd} "$2"${_zero}
+	local _zero _bd _bl _yl
+	if command -v tput &> /dev/null; then
+		_zero="$(tput sgr0 2> /dev/null)"
+		_bd=${_zero}"$(tput bold)"
+		_bl="$(tput setaf 4)"
+		_yl=${_bd}"$(tput setaf 3)"
+	fi
+	if (( $# == 2 )); then
+		echo "$_bl=>$_yl $1:$_bd ${2}$_zero"
 	else
-		echo ${_bl}'=>'${_bd} "$1"${_zero}
+		echo "$_bl=>$_bd ${1}$_zero"
 	fi
 }
 
 post_install() {
-	local _confd='/etc/modules-load.d'
-	local _conf='chromebook_keyboard_backlight_driver.conf'
+	local _confd=/etc/modules-load.d
+	local _conf=chromebook_keyboard_backlight_driver.conf
+    local _multi=$pkgdir/multi-kernel.install
 	depmod -a
-	_spit 'note' "Added $_conf to ${_confd}."
+	_spit 'note' "Added $_conf to $_confd."
 	_spit "For 'backlight' variant, toggle commented lines where appropriate."
 	_spit "Or, delete file to prevent auto-loading entirely. Otherwise, reboot."
 	_spit "Afterwards, check dmesg, lsmod, or '/sys/class/leds' to verify."
+	if (( $(wc -l "$_multi" | awk '{print $1}') > 1 )); then
+		cp -v "$_multi" /tmp
+		_spit "To use on multiple kernels, run \`sudo bash /tmp/${_multi##*/}\`"
+	fi
 }
 
 post_upgrade() {