Updates

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)"

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"
 

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

builder/patches/offline/permissions.patch

@@ -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"
- )

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"
  )
-