From: John Crispin <john@openwrt.org>
Date: Mon, 24 Nov 2014 19:14:29 +0000 (+0000)
Subject: procd: fix/clean some conditions in nand.sh
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=db69761f9494ca3ebb7ebb559872809de061d973;p=openwrt%2Fstaging%2Fthess.git

procd: fix/clean some conditions in nand.sh

1) nand_upgrade_tar: use a simpler condition that matches if () { }
   logic and fix check of $kernel_length variable
2) nand_do_upgrade_stage2: use case, otherwise one could believe we
   always call nand_upgrade_tar

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>

SVN-Revision: 43373
---

diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
index 0d30810b83..1da63e2cc1 100644
--- a/package/system/procd/files/nand.sh
+++ b/package/system/procd/files/nand.sh
@@ -250,10 +250,10 @@ nand_upgrade_tar() {
 	local has_kernel=1
 	local has_env=0
 
-	[ "kernel_length" = 0 -o -z "$kernel_mtd" ] || {
+	[ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && {
 		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
 	}
-	[ "kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
+	[ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
 
 	nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "$has_kernel" "$has_env"
 
@@ -277,9 +277,11 @@ nand_do_upgrade_stage2() {
 
 	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
 
-	[ "$file_type" = "ubi" ] && nand_upgrade_ubinized $1
-	[ "$file_type" = "ubifs" ] && nand_upgrade_ubifs $1
-	nand_upgrade_tar $1
+	case "$file_type" in
+		"ubi")		nand_upgrade_ubinized $1;;
+		"ubifs")	nand_upgrade_ubifs $1;;
+		*)		nand_upgrade_tar $1;;
+	esac
 }
 
 nand_upgrade_stage2() {