From e174f73010f7d42e19e135c42964f8a688a6b179 Mon Sep 17 00:00:00 2001 From: Ouss4 Date: Sun, 12 Apr 2020 14:58:20 +0100 Subject: [PATCH] tools/zipme.sh: Create the hashes unconditionally. --- tools/zipme.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tools/zipme.sh b/tools/zipme.sh index b2aa6b6ad8..0b8c05bf4b 100755 --- a/tools/zipme.sh +++ b/tools/zipme.sh @@ -315,7 +315,16 @@ echo "Archiving and zipping apps/" ${TAR} ${APPS_ZIPNAME} `basename ${APPSDIR}` || \ { echo "tar of ${APPS_ZIPNAME} failed!" ; exit 1 ; } -# Finally sign the tarballs and create the digests +# Create the hashes for the two tarballs + +echo "Creating the hashes" +${SHASUM} ${NUTTX_ZIPNAME} > ${NUTTX_SHANAME} || \ + { echo "Digest of ${NUTTX_ZIPNAME} failed!" ; exit 1 ; } + +${SHASUM} ${APPS_ZIPNAME} > ${APPS_SHANAME} || \ + { echo "Digest of ${APPS_ZIPNAME} failed!" ; exit 1 ; } + +# Finally sign the tarballs if [ $sign != 0 ] ; then echo "Signing the tarballs" @@ -324,12 +333,6 @@ if [ $sign != 0 ] ; then ${GPG} ${APPS_ZIPNAME} || \ { echo "Signing ${APPS_ZIPNAME} failed!" ; exit 1 ; } - - ${SHASUM} ${NUTTX_ZIPNAME} > ${NUTTX_SHANAME} || \ - { echo "Digest of ${NUTTX_ZIPNAME} failed!" ; exit 1 ; } - - ${SHASUM} ${APPS_ZIPNAME} > ${APPS_SHANAME} || \ - { echo "Digest of ${APPS_ZIPNAME} failed!" ; exit 1 ; } fi cd ${NUTTXDIR}