From 2c96987c3d6a44257a3f802c251f90de068089a5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Mon, 11 Apr 2016 09:37:15 -0300
Subject: Fix sha356 filenames for ISO and memstick files

---
 tools/builder_common.sh | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'tools')

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 55384d7..485cbc9 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -2357,16 +2357,12 @@ snapshots_create_latest_symlink() {
 		return
 	fi
 
-	if [ -f "${_image}.gz" ]; then
-		local _image_fixed="${_image}.gz"
-	elif [ -f "${_image}" ]; then
-		local _image_fixed=${_image}
-	else
+	elif [ ! -f "${_image}" ]; then
 		return
 	fi
 
-	local _symlink=$(echo ${_image_fixed} | sed "s,${TIMESTAMP_SUFFIX},-latest,")
-	ln -sf $(basename ${_image_fixed}) ${_symlink}
+	local _symlink=$(echo ${_image} | sed "s,${TIMESTAMP_SUFFIX},-latest,")
+	ln -sf $(basename ${_image}) ${_symlink}
 	ln -sf $(basename ${_image}).sha256 ${_symlink}.sha256
 }
 
@@ -2407,7 +2403,8 @@ snapshots_copy_to_staging_iso_updates() {
 		if [ ! -f "${_img}.gz" ]; then
 			continue
 		fi
-		sha256 ${_img}.gz > ${_img}.sha256
+		_img="${_img}.gz"
+		sha256 ${_img} > ${_img}.sha256
 		cp -l ${_img}* $STAGINGAREA/ 2>/dev/null
 		snapshots_create_latest_symlink ${STAGINGAREA}/$(basename ${_img})
 	done
-- 
cgit v1.1