From 30d97c62446d6c36cb41288e3ade9eaa713c2139 Mon Sep 17 00:00:00 2001
From: dzaitsev <dzaitsev@stormagic.com>
Date: Sun, 4 May 2025 13:40:28 +0300
Subject: [PATCH] zip update

---
 build/jenkins/zip | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/build/jenkins/zip b/build/jenkins/zip
index 5aea3ff..1f8f2e8 100644
--- a/build/jenkins/zip
+++ b/build/jenkins/zip
@@ -53,12 +53,12 @@ pipeline {
                         // def defaultVersion = '1.0.0'
 
 
-                        // Use a powershell step to perform file finding, version extraction, timestamp generation, and zipping
+                        // Use a powershell step to perform file finding, filename extraction, timestamp generation, and zipping
                         powershell '''
                             $ErrorActionPreference = "Stop" # Stop the script on any error
 
                             $sevenZipExe = "$env:SEVEN_ZIP_PATH\\7z.exe"
-                            $defaultVersion = "1.0.0" # Default version if extraction fails
+                            $defaultVersion = "1.0.0" # Default version if no exe is found
                             $exePattern = "AzaionSuite*.exe"
                             $binPattern = "AzaionSuite*.bin"
 
@@ -74,31 +74,17 @@ pipeline {
 
                             Write-Host "Found $($foundFiles.Count) file(s) to archive."
 
-                            # --- Version Extraction (from .exe if present) ---
-                            $version = $defaultVersion
+                            # --- Determine Base Filename for Zip (from .exe if present) ---
+                            $zipBaseFilename = "AzaionSuite.$defaultVersion" # Default base filename
                             $exeFile = Get-ChildItem -Recurse -Path . -Filter $exePattern | Select-Object -First 1
 
                             if ($exeFile) {
-                                Write-Host "Attempting to extract version from '$($exeFile.FullName)'..."
-                                try {
-                                    # Get file version info
-                                    $versionInfo = Get-ItemProperty -Path $exeFile.FullName -Name VersionInfo
-
-                                    # Prefer ProductVersion, fallback to FileVersion
-                                    if ($versionInfo.ProductVersion) {
-                                        $version = $versionInfo.ProductVersion
-                                        Write-Host "Extracted ProductVersion: $version"
-                                    } elseif ($versionInfo.FileVersion) {
-                                        $version = $versionInfo.FileVersion
-                                        Write-Host "Extracted FileVersion: $version"
-                                    } else {
-                                        Write-Warning "Could not extract ProductVersion or FileVersion from '$($exeFile.Name)'. Using default: $version"
-                                    }
-                                } catch {
-                                    Write-Warning "Error extracting version from '$($exeFile.Name)': $_`nUsing default: $version"
-                                }
+                                Write-Host "Executable file found: '$($exeFile.FullName)'"
+                                # Extract filename without extension
+                                $zipBaseFilename = $exeFile.BaseName
+                                Write-Host "Using executable base filename for archive name: '$zipBaseFilename'"
                             } else {
-                                Write-Warning "No executable found matching $exePattern to extract version. Using default: $version"
+                                Write-Warning "No executable found matching $exePattern. Using default base filename: '$zipBaseFilename'"
                             }
 
                             # --- Zipping Logic ---
@@ -106,8 +92,8 @@ pipeline {
                             # Get current date and time in YYYYMMDD-HHmmss format
                             $timestamp = (Get-Date -Format "yyyyMMdd-HHmmss")
 
-                            # Construct the zip filename using extracted version and timestamp
-                            $zipFilename = "AzaionSuite.$version-$timestamp.zip"
+                            # Construct the zip filename using the base filename and timestamp
+                            $zipFilename = "$zipBaseFilename-$timestamp.zip"
 
                             Write-Host "Creating zip archive: $zipFilename using 7-Zip."