From 95bc5d70813ba1468b239ba543fac06096642f35 Mon Sep 17 00:00:00 2001
From: NiLuJe <ninuje@gmail.com>
Date: Thu, 19 Apr 2018 21:08:55 +0200
Subject: [PATCH] [fix] tar args order & Kobo IR grid regression (#3895)

* Fix order of tar args

Otherwise, current tar versions abort

* Unbreak Kobo IR grid resume workaround

Regression after f402ee5f6ff2769fee1f0bca747f5b0b2eafce1b

I'm going to assume my H2O is really, really weird, because that
commit's more than a year old o_O.
---
 Makefile                        | 20 ++++++++++----------
 frontend/device/kobo/device.lua |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 8e367509c..821310580 100644
--- a/Makefile
+++ b/Makefile
@@ -186,8 +186,8 @@ kindleupdate: all
 	# note that the targz file extension is intended to keep ISP from caching
 	# the file, see koreader#1644.
 	cd $(INSTALL_DIR) && \
-		tar czafh ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \
-		-T koreader/ota/package.index --no-recursion
+		tar -czah --no-recursion -f ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \
+		-T koreader/ota/package.index
 
 koboupdate: all
 	# ensure that the binaries were built for ARM
@@ -214,8 +214,8 @@ koboupdate: all
 		koreader/ota/package.index koreader.png README_kobo.txt
 	# make gzip koboupdate for zsync OTA update
 	cd $(INSTALL_DIR) && \
-		tar czafh ../koreader-kobo-$(MACHINE)-$(VERSION).targz \
-		-T koreader/ota/package.index --no-recursion
+		tar -czah --no-recursion -f ../koreader-kobo-$(MACHINE)-$(VERSION).targz \
+		-T koreader/ota/package.index
 
 pbupdate: all
 	# ensure that the binaries were built for ARM
@@ -251,8 +251,8 @@ pbupdate: all
 		applications/koreader/ota/package.index system
 	# make gzip pbupdate for zsync OTA update
 	cd $(INSTALL_DIR)/applications && \
-		tar czafh ../../koreader-pocketbook-$(MACHINE)-$(VERSION).targz \
-		-T koreader/ota/package.index --no-recursion
+		tar -czah --no-recursion -f ../../koreader-pocketbook-$(MACHINE)-$(VERSION).targz \
+		-T koreader/ota/package.index
 
 utupdate: all
 	# ensure that the binaries were built for ARM
@@ -285,8 +285,8 @@ utupdate: all
 		koreader/ota/package.index
 	# make gzip update for zsync OTA update
 	cd $(INSTALL_DIR) && \
-		tar czafh ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \
-		-T koreader/ota/package.index --no-recursion
+		tar -czah --no-recursion -f ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \
+		-T koreader/ota/package.index
 
 	# generate ubuntu touch click package
 	rm -rf $(INSTALL_DIR)/tmp && mkdir -p $(INSTALL_DIR)/tmp
@@ -349,8 +349,8 @@ androidupdate: all
 	$(ISED) '/git-rev/d' $(INSTALL_DIR)/koreader/ota/package.index
 	# make gzip android update for zsync OTA update
 	-cd $(INSTALL_DIR)/koreader && \
-		tar czafh ../../koreader-android-$(MACHINE)-$(VERSION).targz \
-		-T ota/package.index --no-recursion
+		tar -czah --no-recursion -f ../../koreader-android-$(MACHINE)-$(VERSION).targz \
+		-T ota/package.index
 	# make android update apk
 	cd $(INSTALL_DIR)/koreader && 7z a -l -mx=1 \
 		../../$(ANDROID_LAUNCHER_DIR)/assets/module/koreader-$(VERSION).7z * \
diff --git a/frontend/device/kobo/device.lua b/frontend/device/kobo/device.lua
index 8da82d097..6c31fdc33 100644
--- a/frontend/device/kobo/device.lua
+++ b/frontend/device/kobo/device.lua
@@ -517,7 +517,7 @@ function Kobo:resume()
     util.usleep(100000)
     -- cf. #1862, I can reliably break IR touch input on resume...
     -- cf. also #1943 for the rationale behind applying this workaorund in every case...
-    f = io.open("/sys/devices/virtual/input/input1/neocmd", "r")
+    f = io.open("/sys/devices/virtual/input/input1/neocmd", "w")
     if f ~= nil then
         f:write("a\n")
         io.close(f)