Switch from wget to curl for everything
This commit is contained in:
1 parent
4e03f2805e
commit
9a4d535686
4 files changed
+8
-10
No files matched your search
@@ -70,5 +70,5 @@ EOF
|
|||||||
chmod 440 /mnt/etc/sudoers.d/99-omarchy-installer
|
chmod 440 /mnt/etc/sudoers.d/99-omarchy-installer
|
||||||
|
|
||||||
# Run Omarchy web 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
|
fi
|
||||||
+3
-4
@@ -6,7 +6,7 @@ set -e
|
|||||||
# used to build the ISO.
|
# used to build the ISO.
|
||||||
pacman-key --init
|
pacman-key --init
|
||||||
pacman --noconfirm -Sy archlinux-keyring
|
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))
|
cache_dir=$(realpath --canonicalize-missing ~/.cache/omarchy/iso_$(date +%Y-%m-%d))
|
||||||
offline_mirror_dir="$cache_dir/airootfs/var/cache/omarchy/mirror/offline"
|
offline_mirror_dir="$cache_dir/airootfs/var/cache/omarchy/mirror/offline"
|
||||||
@@ -26,10 +26,8 @@ python_packages=(
|
|||||||
)
|
)
|
||||||
arch_packages=(
|
arch_packages=(
|
||||||
git
|
git
|
||||||
impala
|
|
||||||
gum
|
gum
|
||||||
openssl
|
openssl
|
||||||
wget
|
|
||||||
tzupdate # This is technically an AUR package
|
tzupdate # This is technically an AUR package
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -103,7 +101,8 @@ prepare_offline_mirror
|
|||||||
make_archiso_offline
|
make_archiso_offline
|
||||||
|
|
||||||
# Insert the configurator in the root users home folder (default user in the official releng ISO profile).
|
# 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
|
# Clone Omarchy itself
|
||||||
git clone -b dev --single-branch https://github.com/basecamp/omarchy.git "$cache_dir/airootfs/root/omarchy"
|
git clone -b dev --single-branch https://github.com/basecamp/omarchy.git "$cache_dir/airootfs/root/omarchy"
|
||||||
|
|||||||
+4
-4
@@ -3,10 +3,10 @@ set -e
|
|||||||
|
|
||||||
# Note that these are packages installed to the Arch container used to build the ISO.
|
# Note that these are packages installed to the Arch container used to build the ISO.
|
||||||
pacman-key --init
|
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)
|
# 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
|
# We build our iso here
|
||||||
cache_dir=$(realpath --canonicalize-missing ~/.cache/omarchy/iso_$(date +%Y-%m-%d))
|
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"
|
printf '%s\n' "${arch_packages[@]}" >>"packages.x86_64"
|
||||||
|
|
||||||
# Retrieve the latest configurator for setting up user and selecting install disk.
|
# Retrieve the latest configurator for setting up user and selecting install disk.
|
||||||
wget -qO "airootfs/root/configurator" \
|
curl -fsSL -o "airootfs/root/configurator" \
|
||||||
https://raw.githubusercontent.com/$OMARCHY_CONFIGURATOR_REPO/$OMARCHY_CONFIGURATOR_REF/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_REPO" >airootfs/root/omarchy_installer_repo.txt
|
||||||
echo "$OMARCHY_INSTALLER_REF" >airootfs/root/omarchy_installer_ref.txt
|
echo "$OMARCHY_INSTALLER_REF" >airootfs/root/omarchy_installer_ref.txt
|
||||||
|
|||||||
@@ -112,7 +112,6 @@ unzip
|
|||||||
uwsm
|
uwsm
|
||||||
walker
|
walker
|
||||||
waybar
|
waybar
|
||||||
wget
|
|
||||||
whois
|
whois
|
||||||
wiremix
|
wiremix
|
||||||
wireplumber
|
wireplumber
|
||||||
|
|||||||
Reference in new issue
Block a user