From 9a4d535686afeffb4bf263b917f658a24ce38c59 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 23 Aug 2025 19:56:54 +0200 Subject: [PATCH] Switch from wget to curl for everything --- builder/cmds/autostart.sh | 2 +- builder/offline.sh | 7 +++---- builder/online.sh | 8 ++++---- builder/packages/omarchy.packages | 1 - 4 files changed, 8 insertions(+), 10 deletions(-) diff --git a/builder/cmds/autostart.sh b/builder/cmds/autostart.sh index 42860de..8bf8c39 100644 --- a/builder/cmds/autostart.sh +++ b/builder/cmds/autostart.sh @@ -70,5 +70,5 @@ EOF chmod 440 /mnt/etc/sudoers.d/99-omarchy-installer # Run Omarchy web installer - chroot_bash -lc "wget -qO- https://omarchy.org/install | bash" + chroot_bash -lc "curl -fsSL https://omarchy.org/install | bash" fi diff --git a/builder/offline.sh b/builder/offline.sh index bf6f1da..ad21717 100755 --- a/builder/offline.sh +++ b/builder/offline.sh @@ -6,7 +6,7 @@ set -e # used to build the ISO. pacman-key --init pacman --noconfirm -Sy archlinux-keyring -pacman --noconfirm -Sy archiso git python-pip sudo base-devel jq wget +pacman --noconfirm -Sy archiso git python-pip sudo base-devel jq cache_dir=$(realpath --canonicalize-missing ~/.cache/omarchy/iso_$(date +%Y-%m-%d)) offline_mirror_dir="$cache_dir/airootfs/var/cache/omarchy/mirror/offline" @@ -26,10 +26,8 @@ python_packages=( ) arch_packages=( git - impala gum openssl - wget tzupdate # This is technically an AUR package ) @@ -103,7 +101,8 @@ prepare_offline_mirror make_archiso_offline # Insert the configurator in the root users home folder (default user in the official releng ISO profile). -wget -qO "$cache_dir/airootfs/root/installer" https://raw.githubusercontent.com/omacom-io/omarchy-installer/HEAD/installer +curl -fsSL -o "airootfs/root/configurator" \ + "https://raw.githubusercontent.com/$omarchy_configurator_repo/$omarchy_configurator_ref/configurator" # Clone Omarchy itself git clone -b dev --single-branch https://github.com/basecamp/omarchy.git "$cache_dir/airootfs/root/omarchy" diff --git a/builder/online.sh b/builder/online.sh index 6b11604..f8be151 100755 --- a/builder/online.sh +++ b/builder/online.sh @@ -3,10 +3,10 @@ set -e # Note that these are packages installed to the Arch container used to build the ISO. pacman-key --init -pacman --noconfirm -Sy archlinux-keyring archiso sudo base-devel wget git +pacman --noconfirm -Sy archlinux-keyring archiso sudo base-devel git # Packages needed for the Omarchy configurator (installer will fetch its own) -arch_packages=(git wget gum openssl iw jq) +arch_packages=(git gum openssl iw jq) # We build our iso here cache_dir=$(realpath --canonicalize-missing ~/.cache/omarchy/iso_$(date +%Y-%m-%d)) @@ -20,8 +20,8 @@ cp -r /archiso/configs/releng/* . printf '%s\n' "${arch_packages[@]}" >>"packages.x86_64" # Retrieve the latest configurator for setting up user and selecting install disk. -wget -qO "airootfs/root/configurator" \ - https://raw.githubusercontent.com/$OMARCHY_CONFIGURATOR_REPO/$OMARCHY_CONFIGURATOR_REF/configurator +curl -fsSL -o "airootfs/root/configurator" \ + "https://raw.githubusercontent.com/$omarchy_configurator_repo/$omarchy_configurator_ref/configurator" echo "$OMARCHY_INSTALLER_REPO" >airootfs/root/omarchy_installer_repo.txt echo "$OMARCHY_INSTALLER_REF" >airootfs/root/omarchy_installer_ref.txt diff --git a/builder/packages/omarchy.packages b/builder/packages/omarchy.packages index 8732146..58426a5 100644 --- a/builder/packages/omarchy.packages +++ b/builder/packages/omarchy.packages @@ -112,7 +112,6 @@ unzip uwsm walker waybar -wget whois wiremix wireplumber