From ebd6a98db0e1baab9f959ff791deda71949cd553 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Sat, 29 Oct 2022 12:36:54 -0400 Subject: [PATCH] New Release Format --- buildRelease.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildRelease.sh b/buildRelease.sh index 3521b7d22..fc4be5d7d 100755 --- a/buildRelease.sh +++ b/buildRelease.sh @@ -3,8 +3,9 @@ git pull DATE_VAR=`date +%m%d` TIME_VAR=`date +%H%M` VER_VAR=`cat scripts/version.py | awk '/VERSION/{ gsub(/[",]/,"",$2); print $2}' | tail -1` +HASH_VAR=`git rev-parse \`git branch -r --sort=committerdate | tail -1\` | awk '{print substr($0,1,7)}' | tail -1` mv dist/f7-C/f7-update-RM420FAP "$VER_VAR-$DATE_VAR-RM$TIME_VAR" -zip -r "$VER_VAR-$DATE_VAR-RM$TIME_VAR.zip" "$VER_VAR-$DATE_VAR-RM$TIME_VAR" -tar -czvf "$VER_VAR-$DATE_VAR-RM$TIME_VAR.tgz" "$VER_VAR-$DATE_VAR-RM$TIME_VAR" +zip -r "RM$TIME_VAR-$DATE_VAR-$HASH_VAR-$VER_VAR.zip" "$VER_VAR-$DATE_VAR-RM$TIME_VAR" +tar -czvf "RM$TIME_VAR-$DATE_VAR-$HASH_VAR-$VER_VAR.tgz" "$VER_VAR-$DATE_VAR-RM$TIME_VAR" rm -rf "$VER_VAR-$DATE_VAR-RM$TIME_VAR" echo " BUILD COMPLETED, ZIP AND TGZ GENERATED"