From c040ef60b976be418c9805ae07d246642a02910f Mon Sep 17 00:00:00 2001 From: Ryan Hughes Date: Tue, 9 Sep 2025 12:24:44 -0400 Subject: [PATCH] Updates --- builder/cmds/autostart-offline.sh | 16 +++++++---- builder/offline.sh | 3 -- builder/patches/disable-progress-bar.patch | 11 ++++++++ builder/patches/offline/permissions.patch | 15 ---------- builder/patches/profiledef.patch | 32 +++++++++++++++++----- 5 files changed, 47 insertions(+), 30 deletions(-) create mode 100644 builder/patches/disable-progress-bar.patch delete mode 100644 builder/patches/offline/permissions.patch diff --git a/builder/cmds/autostart-offline.sh b/builder/cmds/autostart-offline.sh index 6b929e0..ed7ddfa 100644 --- a/builder/cmds/autostart-offline.sh +++ b/builder/cmds/autostart-offline.sh @@ -112,14 +112,15 @@ chroot_bash() { if [[ $(tty) == "/dev/tty1" ]]; then # Set log file to pull from in trap - LOG_FILE="/var/log/archinstall/install.log" - OMARCHY_PATH="/root/omarchy" - OMARCHY_INSTALL="/root/omarchy/install" + export LOG_FILE="/var/log/omarchy-install.log" + export OMARCHY_PATH="/root/omarchy" + export OMARCHY_INSTALL="/root/omarchy/install" source "$OMARCHY_INSTALL/helpers/size.sh" source "$OMARCHY_INSTALL/helpers/ansi-codes.sh" source "$OMARCHY_INSTALL/helpers/logo.sh" source "$OMARCHY_INSTALL/helpers/gum-styling.sh" + source "$OMARCHY_INSTALL/helpers/tail-log-output.sh" source "$OMARCHY_INSTALL/preflight/trap-errors.sh" set_tokyo_night_colors @@ -128,8 +129,13 @@ if [[ $(tty) == "/dev/tty1" ]]; then clear_logo - # Run archinstall - install_base_system &>/dev/null + gum style --foreground 3 --padding "1 0 0 $PADDING_LEFT" "Installing Omarchy..." + + touch "$LOG_FILE" + + start_log_output + install_base_system 2>&1 | sed -u 's/\x1b\[[0-9;]*[a-zA-Z]//g' >>"$LOG_FILE" + cleanup # Get username from the config file after installation OMARCHY_USER="$(jq -r '.users[0].username' user_credentials.json)" diff --git a/builder/offline.sh b/builder/offline.sh index dae5c25..0abf272 100755 --- a/builder/offline.sh +++ b/builder/offline.sh @@ -136,9 +136,6 @@ mkdir -p "$build_cache_dir/airootfs/usr/local/bin" cp /builder/cmds/omarchy-upload-install-log "$build_cache_dir/airootfs/usr/local/bin/" chmod +x "$build_cache_dir/airootfs/usr/local/bin/omarchy-upload-install-log" -# Apply offline-specific patches -(cd $build_cache_dir/ && git apply /builder/patches/offline/permissions.patch) - # Remove the default motd rm "$build_cache_dir/airootfs/etc/motd" diff --git a/builder/patches/disable-progress-bar.patch b/builder/patches/disable-progress-bar.patch new file mode 100644 index 0000000..1c1be3e --- /dev/null +++ b/builder/patches/disable-progress-bar.patch @@ -0,0 +1,11 @@ +--- a/pacman.conf ++++ b/pacman.conf +@@ -31,7 +31,7 @@ Architecture = auto + # Misc options + #UseSyslog + #Color +-#NoProgressBar ++NoProgressBar + # We cannot check disk space from within a chroot environment + #CheckSpace + #VerbosePkgLists diff --git a/builder/patches/offline/permissions.patch b/builder/patches/offline/permissions.patch deleted file mode 100644 index 6e7dee8..0000000 --- a/builder/patches/offline/permissions.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/profiledef.sh -+++ b/profiledef.sh -@@ -21,7 +21,10 @@ file_permissions=( - ["/root"]="0:0:750" - ["/root/.automated_script.sh"]="0:0:755" - ["/root/.gnupg"]="0:0:700" -+ ["/root/configurator"]="0:0:755" -+ ["/var/cache/omarchy/mirror/offline/"]="0:0:775" -+ ["/root/check_connectivity.sh"]="0:0:755" - ["/usr/local/bin/choose-mirror"]="0:0:755" -- ["/usr/local/bin/Installation_guide"]="0:0:755" -- ["/usr/local/bin/livecd-sound"]="0:0:755" -+ ["/usr/bin/tte"]="0:0:755" -+ ["/usr/lib/omarchy-installer"]="0:0:755" - ) diff --git a/builder/patches/profiledef.patch b/builder/patches/profiledef.patch index 0181cb8..400b253 100644 --- a/builder/patches/profiledef.patch +++ b/builder/patches/profiledef.patch @@ -1,6 +1,6 @@ --- a/profiledef.sh +++ b/profiledef.sh -@@ -1,10 +1,10 @@ +@@ -1,27 +1,28 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 @@ -14,12 +14,30 @@ iso_version="$(date --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') -@@ -22,6 +22,5 @@ file_permissions=( - ["/root/.automated_script.sh"]="0:0:755" - ["/root/.gnupg"]="0:0:700" - ["/usr/local/bin/choose-mirror"]="0:0:755" + bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' +- 'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp' +- 'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito') ++ 'uefi-ia32.systemd-boot.esp' 'uefi-x64.systemd-boot.esp' ++ 'uefi-ia32.systemd-boot.eltorito' 'uefi-x64.systemd-boot.eltorito') + arch="x86_64" + pacman_conf="pacman.conf" + airootfs_image_type="squashfs" + airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') + bootstrap_tarball_compression=('zstd' '-c' '-T0' '--auto-threads=logical' '--long' '-19') + file_permissions=( +- ["/etc/shadow"]="0:0:400" +- ["/root"]="0:0:750" +- ["/root/.automated_script.sh"]="0:0:755" +- ["/root/.gnupg"]="0:0:700" +- ["/usr/local/bin/choose-mirror"]="0:0:755" - ["/usr/local/bin/Installation_guide"]="0:0:755" - ["/usr/local/bin/livecd-sound"]="0:0:755" -+ ["/root/configurator"]="0:0:755" ++ ["/etc/shadow"]="0:0:400" ++ ["/root"]="0:0:750" ++ ["/root/.automated_script.sh"]="0:0:755" ++ ["/root/.gnupg"]="0:0:700" ++ ["/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" ) -