From b375ec03ed561f75fa029462d169bf3e16624d87 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 13 Jan 2016 08:37:53 +0100
Subject: [PATCH] firmware: remove spurious starting messages from backend
 scripts

---
 src/opnsense/scripts/firmware/install.sh   | 3 +--
 src/opnsense/scripts/firmware/lock.sh      | 3 +--
 src/opnsense/scripts/firmware/reinstall.sh | 3 +--
 src/opnsense/scripts/firmware/remove.sh    | 1 -
 src/opnsense/scripts/firmware/unlock.sh    | 3 +--
 src/opnsense/scripts/firmware/upgrade.sh   | 3 +--
 6 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/opnsense/scripts/firmware/install.sh b/src/opnsense/scripts/firmware/install.sh
index 615face2d..b1f40cf53 100755
--- a/src/opnsense/scripts/firmware/install.sh
+++ b/src/opnsense/scripts/firmware/install.sh
@@ -36,8 +36,7 @@ fi
 # Truncate upgrade progress file
 : > ${PKG_PROGRESS_FILE}
 
-echo "***GOT REQUEST TO REINSTALL: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
-echo '***STARTING REINSTALL***' >> ${PKG_PROGRESS_FILE}
+echo "***GOT REQUEST TO INSTALL: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
 pkg install -y $PACKAGE >> ${PKG_PROGRESS_FILE}
 pkg autoremove -y >> ${PKG_PROGRESS_FILE}
 pkg clean -ya >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/lock.sh b/src/opnsense/scripts/firmware/lock.sh
index e65e8698e..0d415102e 100755
--- a/src/opnsense/scripts/firmware/lock.sh
+++ b/src/opnsense/scripts/firmware/lock.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
 # Copyright (C) 2014 Deciso B.V.
 # All rights reserved.
 #
@@ -37,6 +37,5 @@ fi
 : > ${PKG_PROGRESS_FILE}
 
 echo "***GOT REQUEST TO LOCK: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
-echo '***STARTING LOCK***' >> ${PKG_PROGRESS_FILE}
 pkg lock -y $PACKAGE >> ${PKG_PROGRESS_FILE}
 echo '***DONE***' >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/reinstall.sh b/src/opnsense/scripts/firmware/reinstall.sh
index 4a3be0188..d039168c9 100755
--- a/src/opnsense/scripts/firmware/reinstall.sh
+++ b/src/opnsense/scripts/firmware/reinstall.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
 # Copyright (C) 2014 Deciso B.V.
 # All rights reserved.
 #
@@ -37,7 +37,6 @@ fi
 : > ${PKG_PROGRESS_FILE}
 
 echo "***GOT REQUEST TO REINSTALL: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
-echo '***STARTING REINSTALL***' >> ${PKG_PROGRESS_FILE}
 pkg install -yf $PACKAGE >> ${PKG_PROGRESS_FILE}
 pkg autoremove -y >> ${PKG_PROGRESS_FILE}
 pkg clean -ya >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/remove.sh b/src/opnsense/scripts/firmware/remove.sh
index bf722c25f..d49144bc5 100755
--- a/src/opnsense/scripts/firmware/remove.sh
+++ b/src/opnsense/scripts/firmware/remove.sh
@@ -37,7 +37,6 @@ fi
 : > ${PKG_PROGRESS_FILE}
 
 echo "***GOT REQUEST TO REINSTALL: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
-echo '***STARTING REINSTALL***' >> ${PKG_PROGRESS_FILE}
 pkg remove -y $PACKAGE >> ${PKG_PROGRESS_FILE}
 pkg autoremove -y >> ${PKG_PROGRESS_FILE}
 pkg clean -ya >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/unlock.sh b/src/opnsense/scripts/firmware/unlock.sh
index 52481b5f8..909c6e46b 100755
--- a/src/opnsense/scripts/firmware/unlock.sh
+++ b/src/opnsense/scripts/firmware/unlock.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
 # Copyright (C) 2014 Deciso B.V.
 # All rights reserved.
 #
@@ -37,6 +37,5 @@ fi
 : > ${PKG_PROGRESS_FILE}
 
 echo "***GOT REQUEST TO UNLOCK: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
-echo '***STARTING UNLOCK***' >> ${PKG_PROGRESS_FILE}
 pkg unlock -y $PACKAGE >> ${PKG_PROGRESS_FILE}
 echo '***DONE***' >> ${PKG_PROGRESS_FILE}
diff --git a/src/opnsense/scripts/firmware/upgrade.sh b/src/opnsense/scripts/firmware/upgrade.sh
index e2de58755..1ccca4acc 100755
--- a/src/opnsense/scripts/firmware/upgrade.sh
+++ b/src/opnsense/scripts/firmware/upgrade.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright (C) 2015 Franco Fichtner <franco@opnsense.org>
+# Copyright (C) 2015-2016 Franco Fichtner <franco@opnsense.org>
 # Copyright (C) 2014 Deciso B.V.
 # All rights reserved.
 #
@@ -39,7 +39,6 @@ fi
 
 echo "***GOT REQUEST TO UPGRADE: $PACKAGE***" >> ${PKG_PROGRESS_FILE}
 
-echo '***STARTING UPGRADE***' >> ${PKG_PROGRESS_FILE}
 if [ "$PACKAGE" == "all" ]; then
 	# update all installed packages
 	opnsense-update -p >> ${PKG_PROGRESS_FILE}