diff --git a/builder/build-iso.sh b/builder/build-iso.sh index daccdb6..4a4ae2d 100755 --- a/builder/build-iso.sh +++ b/builder/build-iso.sh @@ -2,29 +2,15 @@ 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 --noconfirm -Sy archlinux-keyring -pacman --noconfirm -Sy archiso git python-pip sudo base-devel jq +pacman --noconfirm -Sy archiso git sudo base-devel jq build_cache_dir="/var/cache" offline_mirror_dir="$build_cache_dir/airootfs/var/cache/omarchy/mirror/offline" offline_ruby_dir="$build_cache_dir/airootfs/var/cache/omarchy/ruby" -# We need to fiddle with pip settings -# in order to install to the correct place -# as well as ignore some errors to make this less verbose -export PIP_ROOT="$build_cache_dir/airootfs/" -export PIP_ROOT_USER_ACTION="ignore" -export PIP_NO_WARN_SCRIPT_LOCATION=1 -export PIP_BREAK_SYSTEM_PACKAGES=1 - -# These packages will be installed **into** the ISO, and -# won't be available to either archinstall or omarchy installer. -python_packages=( - terminaltexteffects -) arch_packages=( git gum @@ -35,10 +21,6 @@ arch_packages=( ) prepare_offline_mirror() { - # Certain packages in omarchy.packages are AUR packages. - # These needs to be pre-built and placed in https://pkgs.omarchy.org/$arch - echo "Reading and combining packages from all package files..." - # Combine all packages into one array # Start with base ISO packages (including our arch_packages already appended) all_packages=($(cat "$build_cache_dir/packages.x86_64")) @@ -121,10 +103,6 @@ fi mkdir -p /var/cache/omarchy/mirror ln -s "$offline_mirror_dir" "/var/cache/omarchy/mirror/offline" -# Install Python packages for the installer into the ISO -# file system. -pip install "${python_packages[@]}" - # Copy the pacman.conf to the ISO's /etc directory so the live environment uses our # same config when booted cp $build_cache_dir/pacman.conf "$build_cache_dir/airootfs/etc/pacman.conf" diff --git a/configs/profiledef.sh b/configs/profiledef.sh index 20cf7fa..1785bbc 100644 --- a/configs/profiledef.sh +++ b/configs/profiledef.sh @@ -24,6 +24,5 @@ file_permissions=( ["/usr/local/bin/choose-mirror"]="0:0:755" ["/root/configurator"]="0:0:755" ["/var/cache/omarchy/mirror/offline/"]="0:0:775" - ["/usr/bin/tte"]="0:0:755" ["/usr/local/bin/omarchy-upload-log"]="0:0:755" )