[neon/infrastructure/pangea-data] imager: adapt to using desktop as a $TYPE

[Carlos De Maine]

Git commit 96b2eec6916b691e1dcee0607eb436950e22a829 by Carlos De Maine.
Committed on 17/06/2026 at 03:11.
Pushed by carlosdem into branch 'master'.

adapt to using desktop as a $TYPE

M  +8    -27   imager/build.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/96b2eec6916b691e1dcee0607eb436950e22a829

diff --git a/imager/build.sh b/imager/build.sh
index 04547de..979e11a 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -163,24 +163,12 @@ fi
 mv livecd.neon.* ../result/
 cd ../result/
 
-
-
-# All *release* iso's and also during LTS update all FUTURE_SERIES iso are published to a different location
-# and naming altered to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
-# we also override TYPE with the 'new_type' variable to alter naming for non-desktop editions
-new_type="${NEONARCHIVE}-${TYPE}"
-
-if [ $TYPE = 'release' ] || [ $DIST == "${FUTURE_SERIES}" ]; then
-    if [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
-        new_iso_name_timestamped="${IMAGENAME}-${DIST}-$new_type-${DATETIME}"
-    else
-        new_iso_name_timestamped="${IMAGENAME}-${DIST}-${TYPE}-${DATETIME}"
-    fi
-elif [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
-    new_iso_name_timestamped="${IMAGENAME}-$new_type-${DATETIME}"
+# All ${FUTURE_SERIES} iso are published to a different location and naming altered to
+# include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
+if [ $DIST == "${FUTURE_SERIES}" ]; then
+    new_iso_name_timestamped="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${TYPE}-${DATETIME}"
 else
-    # don't change desktop iso's names for current_release
-    new_iso_name_timestamped="${IMAGENAME}-${TYPE}-${DATETIME}"
+    new_iso_name_timestamped="${IMAGENAME}-${NEONARCHIVE}-${TYPE}-${DATETIME}"
 fi
 
 # timestamp our artifacts
@@ -189,16 +177,10 @@ for f in live*; do
     mv $f $new_iso_name_timestamper
 done
 
-if [ $TYPE = 'release' ] || [ $DIST == "${FUTURE_SERIES}" ]; then
-    if [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
-        new_iso_name_current="${IMAGENAME}-${DIST}-$new_type-current"
-    else
-        new_iso_name_current="${IMAGENAME}-${DIST}-${TYPE}-current"
-    fi
-elif [ $TYPE = 'bigscreen' ] || [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] ||  [ $TYPE = 'mobile' ]; then
-    new_iso_name_current="${IMAGENAME}-$new_type-current"
+if [ $DIST == "${FUTURE_SERIES}" ]; then
+    new_iso_name_current="${IMAGENAME}-${DIST}-${NEONARCHIVE}-${TYPE}-current"
 else
-    new_iso_name_current="${IMAGENAME}-${TYPE}-current"
+    new_iso_name_current="${IMAGENAME}-${NEONARCHIVE}-${TYPE}-current"
 fi
 
 ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
@@ -219,7 +201,6 @@ END
 
 # change ownership to make jenkins happy and pass through required bits
 echo $DATETIME > date_stamp
-echo $new_type > new_type
 pwd
 chown -Rv jenkins:jenkins .