Merge pull request #2287 from koreader/houqp-master

minor changes

Makefile

@@ -151,7 +151,7 @@ kindleupdate: all
 	# ensure that the binaries were built for ARM
 	file $(INSTALL_DIR)/koreader/luajit | grep ARM || exit 1
 	# remove old package if any
-	rm -f koreader-kindle-$(MACHINE)-$(VERSION).zip
+	rm -f koreader-$(DIST)-$(MACHINE)-$(VERSION).zip
 	# Kindle launching scripts
 	ln -sf ../$(KINDLE_DIR)/extensions $(INSTALL_DIR)/
 	ln -sf ../$(KINDLE_DIR)/launchpad $(INSTALL_DIR)/
@@ -161,22 +161,22 @@ kindleupdate: all
 	# create new package
 	cd $(INSTALL_DIR) && pwd && \
 		zip -9 -r \
-			../koreader-kindle-$(MACHINE)-$(VERSION).zip \
+			../koreader-$(DIST)-$(MACHINE)-$(VERSION).zip \
 			extensions koreader $(KINDLE_LEGACY_LAUNCHER) \
 			-x "koreader/resources/fonts/*" "koreader/ota/*" \
 			"koreader/resources/icons/src/*" "koreader/spec/*"
 	# generate kindleupdate package index file
-	zipinfo -1 koreader-kindle-$(MACHINE)-$(VERSION).zip > \
+	zipinfo -1 koreader-$(DIST)-$(MACHINE)-$(VERSION).zip > \
 		$(INSTALL_DIR)/koreader/ota/package.index
 	echo "koreader/ota/package.index" >> $(INSTALL_DIR)/koreader/ota/package.index
 	# update index file in zip package
-	cd $(INSTALL_DIR) && zip -u ../koreader-kindle-$(MACHINE)-$(VERSION).zip \
+	cd $(INSTALL_DIR) && zip -u ../koreader-$(DIST)-$(MACHINE)-$(VERSION).zip \
 		koreader/ota/package.index
 	# make gzip kindleupdate for zsync OTA update
 	# note that the targz file extension is intended to keep ISP from caching
 	# the file, see koreader#1644.
 	cd $(INSTALL_DIR) && \
-		tar czafh ../koreader-kindle-$(MACHINE)-$(VERSION).targz \
+		tar czafh ../koreader-$(DIST)-$(MACHINE)-$(VERSION).targz \
 		-T koreader/ota/package.index --no-recursion
 
 koboupdate: all

kodev

@@ -145,9 +145,24 @@ TARGET:
 ${SUPPORTED_RELEASE_TARGETS}"
     [ $# -lt 1 ] && { echo "${RELEASE_HELP_MSG}"; exit 1; }
 
+    while [[ $1 == '-'* ]]; do
+        PARAM=$(echo "$1" | awk -F= '{print $1}')
+        VALUE=$(echo "$1" | awk -F= '{print $2}')
+        case $PARAM in
+            -v | --verbose)
+                export VERBOSE=1 ;;
+            -h | --help)
+                echo "${RELEASE_HELP_MSG}"; exit 0 ;;
+            *)
+                echo "ERROR: unknown option \"$PARAM\""
+                echo "${RELEASE_HELP_MSG}"; exit 1 ;;
+        esac
+        shift 1
+    done
+
+    which tx>/dev/null && make po || echo "WARN: Transifex client not found, no translation pulled."
+
     case $1 in
-        -h | --help)
-            echo "${RELEASE_HELP_MSG}"; exit 0 ;;
         kindle)
             kodev-build kindle
             make TARGET=kindle update ;;

platform/kindle/koreader.sh

@@ -245,7 +245,7 @@ if [ "${FROM_KUAL}" == "yes" ] ; then
 fi
 
 # we keep maximum 100K worth of crash log
-cat crash.log &> /dev/null | tail -c 100000000 > crash.log.new
+cat crash.log 2> /dev/null | tail -c 100000000 > crash.log.new
 mv -f crash.log.new crash.log
 ./reader.lua "$@" >> crash.log 2>&1
 

platform/kobo/koreader.sh

@@ -112,7 +112,7 @@ if awk '$4~/(^|,)ro($|,)/' /proc/mounts | grep ' /mnt/sd ' ; then
 fi
 
 # we keep maximum 100K worth of crash log
-cat crash.log &> /dev/null | tail -c 100000000 > crash.log.new
+cat crash.log 2> /dev/null | tail -c 100000000 > crash.log.new
 mv -f crash.log.new crash.log
 ./reader.lua "${args}" >> crash.log 2>&1
 

platform/pocketbook/koreader.app

@@ -34,7 +34,7 @@ else
 fi
 
 # we keep maximum 100K worth of crash log
-cat crash.log &> /dev/null | tail -c 100000000 > crash.log.new
+cat crash.log 2> /dev/null | tail -c 100000000 > crash.log.new
 mv -f crash.log.new crash.log
 ./reader.lua "$args" >> crash.log 2>&1
 

reader.lua

@@ -206,6 +206,7 @@ local function exitReader()
 
     -- shutdown hardware abstraction
     Device:exit()
+    require("ui/network/manager"):turnOffWifi()
 
     if Profiler then Profiler.stop() end
     os.exit(0)