From 63544524b7ad3a2fa4d3071e6d5829a1fa4e18e3 Mon Sep 17 00:00:00 2001
From: Oliver Smith <ollieparanoid@postmarketos.org>
Date: Thu, 26 Sep 2019 21:43:34 +0200
Subject: [PATCH] main/devicepkg-dev: make shellcheck happy (!636)

---
 main/devicepkg-dev/APKBUILD           | 4 ++--
 main/devicepkg-dev/devicepkg_build.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/devicepkg-dev/APKBUILD b/main/devicepkg-dev/APKBUILD
index 2b76d4ff7..bbca4480b 100644
--- a/main/devicepkg-dev/APKBUILD
+++ b/main/devicepkg-dev/APKBUILD
@@ -1,5 +1,5 @@
 pkgname="devicepkg-dev"
-pkgver=0.9
+pkgver=0.9.1
 pkgrel=0
 pkgdesc="Provides default device package functions"
 url="https://postmarketos.org"
@@ -57,7 +57,7 @@ package() {
 		"$pkgdir/usr/share/devicepkg-dev/compiler-gcc.h"
 }
 sha512sums="d69930dd790b00fb39760a37d95a10899f0d167e10e2804feb05d9ce04f94185dc32d36edc90214aba2ea2aa09bf18f7dab93f1d2eff23f67beb2cc83be30e7c  compiler-gcc.h
-55943344e6c6192642f20246566c8468dba33d4ec4223c4e930f723fdb0fa248001c65a9bbaa5f15c18e9a42811c9b9decedfd5586f481aa762b6423b55d55bb  devicepkg_build.sh
+5230b3d8a61fe0e83deef17072df732c1413abedefbda56a9d2d8f8148b82dc7437a62c3e45115ee21f5208f1e17308506b002c504058552d37e7b5053bb69fa  devicepkg_build.sh
 cc567d1cc236b06240a9bf58d7aadabc44bbe8bb6c8e50c721531d00a1996bdf961ed0a1a9031489d419778e4d16afc6b7f7d176eec5e928b5b91ea2a91059d1  devicepkg_package.sh
 1b038d0bca1e130674497cf7aeb26fac2bcec510ce094fa6f6700fcdcabc778741541c1aa89d3588ed42908f60708a2d9b83ffd5e50e99db619d366458e82256  downstreamkernel_prepare.sh
 bedf319a74bff01780192cd11c872c41a451915cc7e7542c467cd84fa1784236401f57e197258c3aae734f478c31a2052129838861ea204c0985630501f152ca  devicepkg_subpackage_kernel.sh
diff --git a/main/devicepkg-dev/devicepkg_build.sh b/main/devicepkg-dev/devicepkg_build.sh
index 9c9b17ecc..26b3ef5eb 100644
--- a/main/devicepkg-dev/devicepkg_build.sh
+++ b/main/devicepkg-dev/devicepkg_build.sh
@@ -65,12 +65,12 @@ echo_libinput_calibration()
 }
 
 # shellcheck disable=SC2154
-if [ ! -z "$deviceinfo_dev_touchscreen" ]; then
+if [ -n "$deviceinfo_dev_touchscreen" ]; then
 	# Create touchscreen udev rule
 	{
 		echo "SUBSYSTEM==\"input\", ENV{DEVNAME}==\"$deviceinfo_dev_touchscreen\", \\"
 		# shellcheck disable=SC2154
-		if [ ! -z "$deviceinfo_dev_touchscreen_calibration" ]; then
+		if [ -n "$deviceinfo_dev_touchscreen_calibration" ]; then
 			echo "ENV{WL_CALIBRATION}=\"$deviceinfo_dev_touchscreen_calibration\", \\"
 
 			# The following intentionally expands the touchscreen calibration into the