From 5bf1dfdd90068a9c88d3f9608b140267c0ef20a3 Mon Sep 17 00:00:00 2001
From: zador-blood-stained <zador-blood-stained@users.noreply.github.com>
Date: Thu, 11 Aug 2016 21:04:41 +0300
Subject: [PATCH] Add more logging

---
 general.sh | 5 +++--
 main.sh    | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/general.sh b/general.sh
index 5f2fee5caa..b6e4d20b11 100644
--- a/general.sh
+++ b/general.sh
@@ -589,8 +589,9 @@ download_toolchain()
 
 	display_alert "Verifying"
 	if grep -q 'BEGIN PGP SIGNATURE' ${filename}.asc; then
-		gpg --list-keys 8F427EAF || gpg --keyserver keyserver.ubuntu.com --recv-keys 8F427EAF
-		gpg --verify --trust-model always -q ${filename}.asc && verified=true
+		(gpg --list-keys 8F427EAF || gpg --keyserver keyserver.ubuntu.com --recv-keys 8F427EAF) 2>&1 | tee -a $DEST/debug/output.log
+		gpg --verify --trust-model always -q ${filename}.asc 2>&1 | tee -a $DEST/debug/output.log
+		[[ ${PIPESTATUS[0]} -eq 0 ]] && verified=true
 	else
 		md5sum -c --status ${filename}.asc && verified=true
 	fi
diff --git a/main.sh b/main.sh
index f66b86490b..fc2a020eb2 100644
--- a/main.sh
+++ b/main.sh
@@ -155,6 +155,7 @@ source $SRC/lib/configuration.sh
 VERSION="Armbian $REVISION ${BOARD^} $DISTRIBUTION $RELEASE $BRANCH"
 
 echo `date +"%d.%m.%Y %H:%M:%S"` $VERSION >> $DEST/debug/output.log
+(cd $SRC/lib; echo "Build script version: $(git rev-parse @)") >> $DEST/debug/output.log
 
 display_alert "Starting Armbian build script" "@host" "info"