From c3f581290610ea35111572bf0a78d608cda665d3 Mon Sep 17 00:00:00 2001
From: Mike Salvatore <mike.s.salvatore@gmail.com>
Date: Thu, 21 Oct 2021 12:19:08 -0400
Subject: [PATCH] Build: Refactor agent versioning

---
 build_scripts/appimage/appimage.sh | 25 +++++++------------------
 1 file changed, 7 insertions(+), 18 deletions(-)

diff --git a/build_scripts/appimage/appimage.sh b/build_scripts/appimage/appimage.sh
index a5d0bebc0..fead9901a 100755
--- a/build_scripts/appimage/appimage.sh
+++ b/build_scripts/appimage/appimage.sh
@@ -104,12 +104,16 @@ remove_python_appdir_artifacts() {
 }
 
 build_package() {
-  local version=$1
   local commit_id=$2
   local dist_dir=$3
 
   log_message "Building AppImage"
-  set_version "$version"
+
+  if [ -n "$1" ]; then
+    local version="v$1"
+  else
+    local version="$commit_id"
+  fi
 
   pushd "$APPIMAGE_DIR"
   ARCH="x86_64" linuxdeploy \
@@ -120,27 +124,12 @@ build_package() {
       --deploy-deps-only="$MONGO_PATH/bin/mongod"\
       --output appimage
 
-  # Rename to
-  if $IS_RELEASE_BUILD; then
-    dst_name="InfectionMonkey-v$version.AppImage"
-  else
-    dst_name="InfectionMonkey-$commit_id.AppImage"
-  fi
+  dst_name="InfectionMonkey-$version.AppImage"
   move_package_to_dist_dir $dist_dir $dst_name
 
   popd
 }
 
-set_version() {
-  # The linuxdeploy and appimage-builder tools will use the commit hash of the
-  # repo to name the AppImage. If the
-  # version was specified in a command-line argument, then
-  # setting the VERSION environment variable will change this behavior.
-  if [ -n "$1" ]; then
-    export VERSION="$1"
-  fi
-}
-
 move_package_to_dist_dir() {
     mv Infection*Monkey*.AppImage "$1/$2"
 }