[neon/infrastructure/pangea-data] imager: declare timestamped variable first

[Carlos De Maine]

Git commit 0fdd867f072f258067dccca3bad1468ad0fcc68c by Carlos De Maine.
Committed on 29/09/2024 at 11:36.
Pushed by carlosdem into branch 'master'.

declare timestamped variable first

M  +10   -7    imager/build.sh

https://invent.kde.org/neon/infrastructure/pangea-data/-/commit/0fdd867f072f258067dccca3bad1468ad0fcc68c

diff --git a/imager/build.sh b/imager/build.sh
index 3843dfb..267debe 100755
--- a/imager/build.sh
+++ b/imager/build.sh
@@ -127,7 +127,8 @@ export LB_ARCHIVES="http://archive.neon.kde.org/${NEONARCHIVE}"
 [ -z "$SEEDED_SNAPS" ] && SEEDED_SNAPS="$(dirname "$0")/seeded-snaps-${IMAGENAME}"
 
 # jriddell 03-2019 special case where developer and ko ISOs get their build hooks to allow for simpler ISO names
-if [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] || [ $TYPE = 'mobile' ] || [ $TYPE = 'bigscreen' ]; then
+# carlosd 09-24 limit to jammy as from noble on we want dist in the iso name
+if [ $TYPE = 'developer' ] || [ $TYPE = 'ko' ] || [ $TYPE = 'mobile' ] || [ $TYPE = 'bigscreen' ] && [ $DIST = 'jammy' ]; then
     CONFIG_SETTINGS="$(dirname "$0")/config-settings-${IMAGENAME}-${TYPE}.sh"
     CONFIG_HOOKS="$(dirname "$0")/config-hooks-${IMAGENAME}-${TYPE}"
     BUILD_HOOKS="$(dirname "$0")/build-hooks-${IMAGENAME}-${TYPE}"
@@ -163,11 +164,12 @@ cd ../result/
 
 # change to include $DIST to be able to differentiate iso's e.g.-> neon-noble-release-#######.iso
 if [ $TYPE = 'release' ] || [ $DIST = 'noble' ]; then
+    new_iso_name_timestamped="${IMAGENAME}-${DIST}-${TYPE}-${DATETIME}"
     for f in live*; do
-        new_iso_name_timestamped=$(echo $f | sed "s/livecd\.neon/${IMAGENAME}-${DIST}-${TYPE}-${DATETIME}/")
-        mv $f $new_iso_name_timestamped
+        new_iso_name_timestamper=$(echo $f | sed "s/livecd\.neon/$new_iso_name_timestamped/")
+        mv $f $new_iso_name_timestamper
     done
-    new_iso_name_current="neon-${IMAGENAME}-${DIST}-${TYPE}-current"
+    new_iso_name_current="${IMAGENAME}-${DIST}-${TYPE}-current"
     ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
     zsyncmake $new_iso_name_current.iso
     sha256sum $new_iso_name_timestamped.iso > $new_iso_name_timestamped.sha256sum
@@ -184,11 +186,12 @@ $new_iso_name_timestamped.torrent Web Seed torrent (you client needs to support
 END
 # don't change jammy iso's apart from unpublished release iso
 else
+new_iso_name_timestamped="${IMAGENAME}-${TYPE}-${DATETIME}"
     for f in live*; do
-        new_iso_name_timestamped=$(echo $f | sed "s/livecd\.neon/${IMAGENAME}-${TYPE}-${DATETIME}/")
-        mv $f $new_iso_name_timestamped
+        new_iso_name_timestamper=$(echo $f | sed "s/livecd\.neon/$new_iso_name_timestamped/")
+        mv $f $new_iso_name_timestamper
     done
-    new_iso_name_current="neon-${IMAGENAME}-${TYPE}-current"
+    new_iso_name_current="${IMAGENAME}-${TYPE}-current"
     ln -s $new_iso_name_timestamped.iso $new_iso_name_current.iso
     zsyncmake $new_iso_name_current.iso
     sha256sum $new_iso_name_timestamped.iso > $new_iso_name_timestamped.sha256sum