From 5a79f0b77433706f97a3404105a575eb7f81a968 Mon Sep 17 00:00:00 2001
From: nr0q <nr0q@gridtracker.org>
Date: Sat, 21 Oct 2023 12:31:10 -0500
Subject: [PATCH] more cleanup for proper versioning of packges

---
 .gitlab-ci.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18073a2..bca003d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -149,6 +149,7 @@ linux:package:
     - |
       # Making our distro agnostic Linux packages
       test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
+      VER=`node version.js`
       echo -e "\e[0Ksection_start:`date +%s`:native_build[collapsed=true]\r\e[0KBuilding native packages"
       npm install --prefer-offline
       npm run dist-nix
@@ -169,7 +170,7 @@ linux:package:
       echo -e "\e[0Ksection_end:`date +%s`:debian_build\r\e[0K"
       echo -e "\e[0Ksection_start:`date +%s`:flatpaks\e[0KBuilding Flatpak"
       flatpak-builder flatpak flatpak_x64_manifest.yml --force-clean --repo=flatpakrepo
-      flatpak build-bundle flatpakrepo GridTracker-${VER}sion-x86_64.flatpak org.gridtracker.GridTracker
+      flatpak build-bundle flatpakrepo GridTracker-${VER}-x86_64.flatpak org.gridtracker.GridTracker
       mv *.flatpak artifacts/
       echo -e "\e[0Ksection_end:`date +%s`:flatpaks\r\e[0K"
       echo "we made LINUX packages!"
@@ -249,6 +250,7 @@ arm:package:
     - |
       # This is for ARM 32 arch build
       test `node version.js` = `dpkg-parsechangelog -S version` || (echo "package.nw/package.json and debian/changelog version mismatch"; exit 1)
+      VER=`node version.js`
       echo "Getting Upstream NWJS arm32 Binary"
       wget -q https://github.com/LeonardLaszlo/nw.js-armv7-binaries/releases/download/$NWJS32_BUILD/$NWJS32_BUILD.tar.gz
       echo "Extracting $NWJS32_BUILD.tar.gz...."
@@ -262,15 +264,15 @@ arm:package:
       echo "Merging $nwjs-$NWJS_VERSION-linux-arm binary with GridTracker..."
       mv nwjs-$NWJS_VERSION-linux-arm/nw nwjs-$NWJS_VERSION-linux-arm/GridTracker
       version=`node ./version.js`
-      mkdir GridTracker-${VER}sion-linux-arm32
-      cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-${VER}sion-linux-arm32/
-      cp -r arm/* GridTracker-${VER}sion-linux-arm32/
-      cp -r package.nw GridTracker-${VER}sion-linux-arm32/
-      cp LICENSE GridTracker-${VER}sion-linux-arm32/
-      echo "Compressing GridTracker-${VER}sion-linux-arm32.tar.gz..."
-      tar -czf GridTracker-${VER}sion-linux-arm32.tar.gz GridTracker-${VER}sion-linux-arm32
-      mv GridTracker-${VER}sion-linux-arm32.tar.gz artifacts/
-      echo "GridTracker-${VER}sion-linux-arm32.tar.gz built."
+      mkdir GridTracker-${VER}-linux-arm32
+      cp -r nwjs-$NWJS_VERSION-linux-arm/* GridTracker-${VER}-linux-arm32/
+      cp -r arm/* GridTracker-${VER}-linux-arm32/
+      cp -r package.nw GridTracker-${VER}-linux-arm32/
+      cp LICENSE GridTracker-${VER}-linux-arm32/
+      echo "Compressing GridTracker-${VER}-linux-arm32.tar.gz..."
+      tar -czf GridTracker-${VER}-linux-arm32.tar.gz GridTracker-${VER}-linux-arm32
+      mv GridTracker-${VER}-linux-arm32.tar.gz artifacts/
+      echo "GridTracker-${VER}-linux-arm32.tar.gz built."
       rm -rf nwjs-$NWJS_VERSION-linux-arm
       # This is for ARM 64 arch build
       echo "Getting Upstream NWJS arm64 Binary"