From e20f989417d471a752049698249140cde8b1874e Mon Sep 17 00:00:00 2001
From: Sunderland93 <samoilov.lex@gmail.com>
Date: Fri, 10 Jun 2022 12:39:43 +0400
Subject: [PATCH] Bring back missing dev/stable switch support for iso

---
 build.sh                                                    | 2 +-
 etc/config/archives/mozillateam.list                        | 2 +-
 etc/config/archives/ubuntu-sway-dev.list                    | 1 -
 etc/config/archives/{ubuntu-sway-dev.key => ubuntusway.key} | 0
 etc/config/archives/ubuntusway.list                         | 2 ++
 etc/config/package-lists.calamares/pool.list.binary         | 5 ++++-
 etc/terraform.conf                                          | 4 ++--
 7 files changed, 10 insertions(+), 6 deletions(-)
 delete mode 100644 etc/config/archives/ubuntu-sway-dev.list
 rename etc/config/archives/{ubuntu-sway-dev.key => ubuntusway.key} (100%)
 create mode 100644 etc/config/archives/ubuntusway.list

diff --git a/build.sh b/build.sh
index d0a95a2..72c7885 100755
--- a/build.sh
+++ b/build.sh
@@ -72,7 +72,7 @@ build () {
     YYYYMMDD="$(date +%Y%m%d%H%M)"
     OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH"
     mkdir -p "$OUTPUT_DIR"
-    FNAME="ubuntusway-$VERSION-$BUILD_ARCH-$YYYYMMDD-$OUTPUT_SUFFIX"
+    FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX"
     mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
 
     md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
diff --git a/etc/config/archives/mozillateam.list b/etc/config/archives/mozillateam.list
index d2e5a39..2d3328f 100644
--- a/etc/config/archives/mozillateam.list
+++ b/etc/config/archives/mozillateam.list
@@ -1 +1 @@
-deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu jammy main
+deb https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu @BASECODENAME main
diff --git a/etc/config/archives/ubuntu-sway-dev.list b/etc/config/archives/ubuntu-sway-dev.list
deleted file mode 100644
index f915af6..0000000
--- a/etc/config/archives/ubuntu-sway-dev.list
+++ /dev/null
@@ -1 +0,0 @@
-deb https://ppa.launchpadcontent.net/ubuntusway-dev/dev/ubuntu jammy main 
diff --git a/etc/config/archives/ubuntu-sway-dev.key b/etc/config/archives/ubuntusway.key
similarity index 100%
rename from etc/config/archives/ubuntu-sway-dev.key
rename to etc/config/archives/ubuntusway.key
diff --git a/etc/config/archives/ubuntusway.list b/etc/config/archives/ubuntusway.list
new file mode 100644
index 0000000..8ff7c6f
--- /dev/null
+++ b/etc/config/archives/ubuntusway.list
@@ -0,0 +1,2 @@
+deb https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main
+deb-src https://ppa.launchpadcontent.net/ubuntusway-dev/@CHANNEL/ubuntu @BASECODENAME main
diff --git a/etc/config/package-lists.calamares/pool.list.binary b/etc/config/package-lists.calamares/pool.list.binary
index 47e17ec..7873576 100644
--- a/etc/config/package-lists.calamares/pool.list.binary
+++ b/etc/config/package-lists.calamares/pool.list.binary
@@ -5,11 +5,14 @@ intel-microcode
 iucode-tool
 setserial
 user-setup
+
 efibootmgr
-grub-efi
 secureboot-db
+
+#if ARCHITECTURES amd64
 grub-efi-amd64
 grub-efi-amd64-bin
 grub-efi-amd64-signed
 shim
 shim-signed
+#endif
diff --git a/etc/terraform.conf b/etc/terraform.conf
index 23dbcf4..f45f574 100644
--- a/etc/terraform.conf
+++ b/etc/terraform.conf
@@ -14,8 +14,8 @@ CODENAME="jammy"
 VERSION="22.04"
 
 # distribution channel
-#CHANNEL="unstable"
-CHANNEL="stable"
+#CHANNEL="stable"
+CHANNEL="dev"
 
 # distribution name
 NAME="Ubuntu Sway Remix"