From 58ca375e5f41f9a8944b57519aeabd4dbb2a2cbb Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 01:33:38 +0000
Subject: [PATCH 1/6] brl-fetch: add development releases of fedora

---
 .../share/brl-fetch/distros/fedora            | 44 +++++++++++++++++--
 1 file changed, 40 insertions(+), 4 deletions(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index ebcd0c65..754db39b 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -18,7 +18,14 @@ check_supported() {
 }
 
 speed_test_url() {
-	echo "releases/${target_release}/Everything/${distro_arch}/os/repodata/repomd.xml"
+
+	if [[ $(list_development | tr -d '[:space:]') == *${target_release}* ]]; then
+		url_type="development"
+	else
+		url_type="releases"
+	fi
+	
+	echo "${url_type}/${target_release}/Everything/${distro_arch}/os/repodata/repomd.xml"
 }
 
 list_mirrors() {
@@ -53,12 +60,27 @@ EOF
 }
 
 default_release() {
-	list_releases |
+	list_release |
 		sort -n |
 		tail -n1
 }
 
 list_releases() {
+
+	echo
+	echo "Release"
+	echo "---------------------"
+
+	list_release
+
+	echo
+	echo "Development"
+	echo "---------------------"
+	
+	list_development
+}
+
+list_release() {
 	download -q 'https://dl.fedoraproject.org/pub/fedora/linux/releases/' - |
 		list_links |
 		grep '^[0-9][0-9]*/$' |
@@ -66,6 +88,14 @@ list_releases() {
 		sort -n
 }
 
+list_development() {
+	download -q 'https://dl.fedoraproject.org/pub/fedora/linux/development/' - |
+	list_links |
+	sed 's,/$,,' |
+	grep -v "/" |
+	sort -n
+}
+
 determine_package_manager() {
 	if [ -e "${bootstrap_dir}/brldb/depends/dn" ] && grep -q '^dnf\>' "${bootstrap_dir}/brldb/depends/dn"; then
 		echo "dnf"
@@ -78,8 +108,14 @@ bootstrap_deps() {
 	echo "${package_manager} rpm fedora-release filesystem fedora-gpg-keys"
 }
 
-fetch() {
-	suffix="releases/${target_release}/Everything/${distro_arch}/os"
+fetch() {	
+	if [[ $(list_development | tr -d '[:space:]') == *${target_release}* ]]; then
+		url_type="development"
+	else
+		url_type="releases"
+	fi
+	
+	suffix="${url_type}/${target_release}/Everything/${distro_arch}/os"
 
 	step "Downloading package information database"
 	url="$(find_link "${target_mirror}/${suffix}/repodata/" "primary.xml.gz")"

From 2110133bed023a6a1c7570f12bfe9b284bf67d89 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:10:15 +0000
Subject: [PATCH 2/6] brl-fetch: remove formatting on list_releases

---
 src/slash-bedrock/share/brl-fetch/distros/fedora | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index 754db39b..d7a43ae2 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -66,17 +66,7 @@ default_release() {
 }
 
 list_releases() {
-
-	echo
-	echo "Release"
-	echo "---------------------"
-
 	list_release
-
-	echo
-	echo "Development"
-	echo "---------------------"
-	
 	list_development
 }
 

From f4e7e7ad8fc01e04302d8f76569c0539abe9ee99 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:15:36 +0000
Subject: [PATCH 3/6] brl-fetch: add set_url_type to fedora

---
 src/slash-bedrock/share/brl-fetch/distros/fedora | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index d7a43ae2..08e68a51 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -17,14 +17,16 @@ check_supported() {
 	true
 }
 
-speed_test_url() {
-
+set_url_type() {
 	if [[ $(list_development | tr -d '[:space:]') == *${target_release}* ]]; then
 		url_type="development"
 	else
 		url_type="releases"
 	fi
-	
+}
+
+speed_test_url() {
+	set_url_type
 	echo "${url_type}/${target_release}/Everything/${distro_arch}/os/repodata/repomd.xml"
 }
 
@@ -99,11 +101,7 @@ bootstrap_deps() {
 }
 
 fetch() {	
-	if [[ $(list_development | tr -d '[:space:]') == *${target_release}* ]]; then
-		url_type="development"
-	else
-		url_type="releases"
-	fi
+	set_url_type
 	
 	suffix="${url_type}/${target_release}/Everything/${distro_arch}/os"
 

From 88a59a5019518a231925d7ff80bb84ef51dc7026 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:31:45 +0000
Subject: [PATCH 4/6] brl-fetch: sh complient if statement

---
 src/slash-bedrock/share/brl-fetch/distros/fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index 08e68a51..adcfe777 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -18,7 +18,7 @@ check_supported() {
 }
 
 set_url_type() {
-	if [[ $(list_development | tr -d '[:space:]') == *${target_release}* ]]; then
+	if ! list_development | awk -v"x=${target_release}" '$0 == x {exit 1}'; then
 		url_type="development"
 	else
 		url_type="releases"

From f150be58902abb9bd6ff571090fa837f4e20fd23 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 02:38:51 +0000
Subject: [PATCH 5/6] brl-fetch: fix openh264 repo issue with rawhide

---
 src/slash-bedrock/share/brl-fetch/distros/fedora | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index adcfe777..f6fa9b97 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -178,7 +178,7 @@ fetch() {
 	fi
 
 	LC_ALL=C chroot "${bootstrap_dir}" rpm -i --root=/target-root --nodeps ./packages/fedora-release-*.rpm 2>/dev/null || true
-	LC_ALL=C chroot "${bootstrap_dir}" "${package_manager}" --installroot=/target-root install -y rpm-build "${package_manager}" fedora-repos
+	LC_ALL=C chroot "${bootstrap_dir}" "${package_manager}" --installroot=/target-root install -y rpm-build "${package_manager}" fedora-repos --releasever ${target_release}
 	# Need to set database timestamps for pmm due to `dnf -C` usage
 	umount -l "${bootstrap_dir}/var/cache/dnf" >/dev/null 2>&1 || true
 	umount -l "${bootstrap_dir}/var/cache/yum" >/dev/null 2>&1 || true

From 767fad0baa9038d328f76f5075e991d69de92199 Mon Sep 17 00:00:00 2001
From: CactiChameleon9 <51231053+CactiChameleon9@users.noreply.github.com>
Date: Tue, 8 Mar 2022 07:13:39 +0000
Subject: [PATCH 6/6] brl-fetch: fix the order releases are shown

---
 src/slash-bedrock/share/brl-fetch/distros/fedora | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/slash-bedrock/share/brl-fetch/distros/fedora b/src/slash-bedrock/share/brl-fetch/distros/fedora
index f6fa9b97..8dcd2f2d 100644
--- a/src/slash-bedrock/share/brl-fetch/distros/fedora
+++ b/src/slash-bedrock/share/brl-fetch/distros/fedora
@@ -68,24 +68,24 @@ default_release() {
 }
 
 list_releases() {
-	list_release
-	list_development
+	(
+		list_release
+		list_development
+	) | sort -n
 }
 
 list_release() {
 	download -q 'https://dl.fedoraproject.org/pub/fedora/linux/releases/' - |
 		list_links |
 		grep '^[0-9][0-9]*/$' |
-		sed 's,/$,,' |
-		sort -n
+		sed 's,/$,,'
 }
 
 list_development() {
 	download -q 'https://dl.fedoraproject.org/pub/fedora/linux/development/' - |
 	list_links |
 	sed 's,/$,,' |
-	grep -v "/" |
-	sort -n
+	grep -v "/"
 }
 
 determine_package_manager() {