From b31389512f743e9c05323caa8c5e10fb85ac2432 Mon Sep 17 00:00:00 2001
From: osm0sis <osm0sis@outlook.com>
Date: Mon, 10 Apr 2017 20:03:33 -0300
Subject: [PATCH] AK2: misc cleanups - hide unpackelf test stderr - accept dtb
 and dt.img for dt

---
 tools/ak2-core.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/tools/ak2-core.sh b/tools/ak2-core.sh
index 926298f..fddc3dc 100755
--- a/tools/ak2-core.sh
+++ b/tools/ak2-core.sh
@@ -32,7 +32,7 @@ dump_boot() {
   else
     dd if=$block of=/tmp/anykernel/boot.img;
   fi;
-  if [ -f "$bin/unpackelf" -a "$($bin/unpackelf -i /tmp/anykernel/boot.img -h -q; echo $?)" == 0 ]; then
+  if [ -f "$bin/unpackelf" -a "$($bin/unpackelf -i /tmp/anykernel/boot.img -h -q 2>/dev/null; echo $?)" == 0 ]; then
     $bin/unpackelf -i /tmp/anykernel/boot.img -o $split_img;
     mv -f $split_img/boot.img-ramdisk.cpio.gz $split_img/boot.img-ramdisk.gz;
   else
@@ -102,9 +102,13 @@ write_boot() {
     kernel=`ls *-zImage`;
     kernel=$split_img/$kernel;
   fi;
-  if [ -f /tmp/anykernel/dtb ]; then
-    dtb="--dt /tmp/anykernel/dtb";
-  elif [ -f *-dtb ]; then
+  for i in dtb dt.img; do
+    if [ -f /tmp/anykernel/$i ]; then
+      dtb="--dt /tmp/anykernel/$i";
+      break;
+    fi;
+  done;
+  if [ ! "$dtb" -a -f *-dtb ]; then
     dtb=`ls *-dtb`;
     dtb="--dt $split_img/$dtb";
   fi;