Switch out Taiwan with Australia

At least one mirror in Taiwan seems to be incomplete/broken right now.

build_files/common/packages.sh

@@ -52,6 +52,32 @@ curl --retry 3 -Lo /etc/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub
 # flathub repo is present, as-well as the system-installed Firefox as I prefer to use the Flatpak version
 dnf5 remove -y fedora-flathub-remote firefox firefox-langpacks
 
+# Remove additional repositories Fedora comes with out of the box
+# And don't raise an error if any of these files does not exist when attempting
+# to delete them.
+rm \
+  /etc/yum.repos.d/fedora-cisco-openh264.repo \
+  /etc/yum.repos.d/google-chrome.repo \
+  /etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
+  /etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
+  /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
+  2>&1
+
+# Add country query to all repo metalinks
+# shellcheck disable=SC2016
+sed -i -e '/^metalink\=/s/\$releasever\&arch\=\$basearch$/\$releasever\&arch\=\$basearch\&country\=KR,JP,AU/g' /etc/yum.repos.d/*.repo
+
+# Add 1Password repo
+#rpmkeys --import https://downloads.1password.com/linux/keys/1password.asc
+cp /ctx/rpm-keys/1password.asc /etc/pki/rpm-gpg/1password.asc
+sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo'
+
+# Add Tailscale repo
+#rpmkeys --import https://pkgs.tailscale.com/stable/fedora/repo.gpg
+#dnf5 config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable/fedora/tailscale.repo
+cp /ctx/rpm-keys/tailscale.gpg /etc/pki/rpm-gpg/tailscale.gpg
+sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.tailscale.com/stable/fedora/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/tailscale.gpg\"" > /etc/yum.repos.d/tailscale.repo'
+
 # Install my own layered packages
 dnf5 install -y \
   fish \
@@ -67,36 +93,8 @@ dnf5 install -y \
   waypipe \
   htop
 
-# Remove additional repositories Fedora comes with out of the box
-# And don't raise an error if any of these files does not exist when attempting
-# to delete them.
-rm \
-  /etc/yum.repos.d/fedora-cisco-openh264.repo \
-  /etc/yum.repos.d/google-chrome.repo \
-  /etc/yum.repos.d/rpmfusion-nonfree-nvidia-driver.repo \
-  /etc/yum.repos.d/rpmfusion-nonfree-steam.repo \
-  /etc/yum.repos.d/_copr:copr.fedorainfracloud.org:phracek:PyCharm.repo \
-  2>&1
-
-# Add country query to all repo metalinks
-# shellcheck disable=SC2016
-sed -i -e '/^metalink\=/s/\$releasever\&arch\=\$basearch$/\$releasever\&arch\=\$basearch\&country\=KR,JP,TW/g' /etc/yum.repos.d/*.repo
-
-# Add 1Password repo
-#rpmkeys --import https://downloads.1password.com/linux/keys/1password.asc
-cp /ctx/rpm-keys/1password.asc /etc/pki/rpm-gpg/1password.asc
-sh -c 'echo -e "[1password]\nname=1Password Stable Channel\nbaseurl=https://downloads.1password.com/linux/rpm/stable/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/1password.asc\"" > /etc/yum.repos.d/1password.repo'
-
-# Add Tailscale repo
-#rpmkeys --import https://pkgs.tailscale.com/stable/fedora/repo.gpg
-#dnf5 config-manager addrepo --from-repofile=https://pkgs.tailscale.com/stable/fedora/tailscale.repo
-cp /ctx/rpm-keys/tailscale.gpg /etc/pki/rpm-gpg/tailscale.gpg
-sh -c 'echo -e "[tailscale-stable]\nname=Tailscale stable\nbaseurl=https://pkgs.tailscale.com/stable/fedora/\$basearch\nenabled=1\ngpgcheck=1\nrepo_gpgcheck=1\ngpgkey=\"file:///etc/pki/rpm-gpg/tailscale.gpg\"" > /etc/yum.repos.d/tailscale.repo'
-
 cd /tmp
-wget -O bitwarden.rpm https://bitwarden.com/download/?app=desktop &
-platform=linux &
-variant=rpm
+wget -O bitwarden.rpm "https://bitwarden.com/download/?app=desktop&platform=linux&variant=rpm"
 dnf install -y ./bitwarden.rpm
 
 # Update all existing packages

build_files/common/setup.sh

@@ -9,4 +9,4 @@ rsync -rvK /ctx/sys_files/ /
 mkdir -p /etc/pki/containers
 cp /ctx/cosign.pub /etc/pki/containers/davejansen.pub
 
-./packages.sh
+/ctx/common/packages.sh