From 052b5589b03520cdab5af41552998c931988613d Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Tue, 7 May 2024 20:14:54 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20adjust=20calamares=20scripts=20f?=
 =?UTF-8?q?or=20AI=20edition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../usr/local/bin/calamares-ai-edition.sh     | 57 +++++++++++++++++++
 .../usr/local/bin/calamares-online.sh         |  8 ---
 2 files changed, 57 insertions(+), 8 deletions(-)
 create mode 100755 archiso/airootfs/usr/local/bin/calamares-ai-edition.sh

diff --git a/archiso/airootfs/usr/local/bin/calamares-ai-edition.sh b/archiso/airootfs/usr/local/bin/calamares-ai-edition.sh
new file mode 100755
index 0000000..2eb826f
--- /dev/null
+++ b/archiso/airootfs/usr/local/bin/calamares-ai-edition.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+
+FollowFile() {
+    local tailfile="$1"
+    local term_title="$2"
+
+    alacritty -t "$term_title" -e tail -f "$tailfile" &
+}
+
+catch_chrooted_pacman_log() {
+    local pacmanlog=""
+    local lockfile="$HOME/.$1.lck"
+
+    # wait until pacman.log is available in the chrooted system, then follow the log in background
+    while true ; do
+        sleep 2
+        pacmanlog="$(/usr/bin/ls -1 /tmp/calamares-root-*/var/log/pacman.log 2>/dev/null | /usr/bin/tail -n 1)"
+        if [ -n "$pacmanlog" ] ; then
+            # pacman.log found
+            [ -r "$lockfile" ] && return
+            /usr/bin/touch "$lockfile"
+            FollowFile "$pacmanlog" "Pacman log" 400 50
+            break
+        fi
+    done
+}
+
+Main() {
+    local progname="$(basename "$0")"
+    local log="/home/liveuser/cachy-install.log"
+    local _efi_check_dir="/sys/firmware/efi"
+
+    if [ ! -d "${_efi_check_dir}" ]; then
+        notify-send --app-name='CachyOS Welcome' 'MBR/BIOS system is not supported for AI Edition'
+        exit
+    fi
+
+    yes | sudo pacman -R cachyos-calamares-qt6-next-grub
+    yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
+    yes | sudo pacman -R cachyos-calamares-qt6-next-refind
+    yes | sudo pacman -Sy cachyos-calamares-qt6-next-ai
+
+    cat <<EOF > $log
+########## $log by $progname
+########## Started (UTC): $(date -u "+%x %X")
+########## Edition: AI Edition
+EOF
+    FollowFile "$log" "Install log" 20 20
+
+    sudo cp /usr/share/calamares/settings_${mode}.conf /etc/calamares/settings.conf
+    sudo -E  dbus-launch calamares -D6 >> $log &
+
+    # comment out the following line if pacman.log is not needed:
+    catch_chrooted_pacman_log "$progname"
+}
+
+Main "$@"
diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index 18e3818..1841db4 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -51,7 +51,6 @@ Main() {
     --button="Grub:2" \
     --button="Systemd-boot:3" \
     --button="Refind:4" \
-    --button="AI SDK (NVIDIA):5" \
     --text "Choose Bootloader/Edition:" ; echo $?)
     else
         SYSTEM="BIOS/MBR SYSTEM"
@@ -77,13 +76,6 @@ Main() {
         yes | sudo pacman -R cachyos-calamares-qt6-next-grub
         yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
         yes | sudo pacman -Sy cachyos-calamares-qt6-next-refind
-    elif [[ "${_exitcode}" -eq 5 ]]; then
-        BOOTLOADER="REFIND"
-        echo "USING REFIND!"
-        yes | sudo pacman -R cachyos-calamares-qt6-next-grub
-        yes | sudo pacman -R cachyos-calamares-qt6-next-systemd
-        yes | sudo pacman -R cachyos-calamares-qt6-next-refind
-        yes | sudo pacman -Sy cachyos-calamares-qt6-next-ai
     else
         exit
     fi