From d37a1410c87e005e4cfc0db49d2a853a17e31097 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 28 Nov 2018 13:38:22 +0000
Subject: [PATCH] firmware: support architecture as well

---
 src/sbin/opnsense-version | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/sbin/opnsense-version b/src/sbin/opnsense-version
index 108abbb32..6517c7a3c 100755
--- a/src/sbin/opnsense-version
+++ b/src/sbin/opnsense-version
@@ -27,6 +27,7 @@ VERSIONDIR="/usr/local/opnsense/version"
 OPENSSL="/usr/local/bin/openssl"
 OUTPUT=
 
+DO_ARCH=
 DO_PKG="-p core"
 DO_SIZE=
 
@@ -34,6 +35,7 @@ while getopts AaefHNnp:svw OPT; do
 	case ${OPT} in
 	A)
 		OUTPUT="${OUTPUT} \${product_arch}"
+		DO_ARCH="-A"
 		;;
 	a)
 		OUTPUT="${OUTPUT} \${product_abi}"
@@ -74,15 +76,26 @@ done
 
 shift $((${OPTIND} - 1))
 
+if [ -n "${*}" ]; then
+	echo "Arguments are not supported" >&2
+	exit 1
+fi
+
 VERSION="${VERSIONDIR}/${DO_PKG#"-p "}"
 
-if [ -n "${DO_SIZE}" ]; then
-	if [ ! -f ${VERSION}.size ]; then
-		echo "Missing ${VERSION}.size" >&2
+if [ "${DO_PKG}" != "-p core" ]; then
+	if [ -n "${DO_SIZE}" ]; then
+		VERSION="${VERSION}.size"
+	elif [ -n "${DO_ARCH}" ]; then
+		VERSION="${VERSION}.arch"
+	fi
+
+	if [ ! -f ${VERSION} ]; then
+		echo "Missing ${VERSION}" >&2
 		exit 1
 	fi
 
-	cat ${VERSION}.size
+	cat ${VERSION}
 	exit 0
 fi
 
@@ -91,9 +104,10 @@ if [ ! -f ${VERSION} ]; then
 	exit 1
 fi
 
-if [ "${DO_PKG}" != "-p core" ]; then
-	cat ${VERSION}
-	exit 0
+if [ -n "${DO_SIZE}" ]; then
+	# unsupported
+	echo "Missing ${VERSION}.size" >&2
+	exit 1
 fi
 
 eval "$(grep -v '[{}]' ${VERSION} | sed 's/[^"]*"\([^"]*\)"[^"]*"\([^"]*\)".*/\1="\2"/')"