From d9719b6085d5583a99b5db06ed005cd373395a8e Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Fri, 11 Oct 2024 14:53:06 +0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B7=20calamares.sh:=20acknowledge=20IS?=
 =?UTF-8?q?O=20version?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 archiso/airootfs/usr/local/bin/calamares-online.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/archiso/airootfs/usr/local/bin/calamares-online.sh b/archiso/airootfs/usr/local/bin/calamares-online.sh
index 100ba09..ab7d956 100755
--- a/archiso/airootfs/usr/local/bin/calamares-online.sh
+++ b/archiso/airootfs/usr/local/bin/calamares-online.sh
@@ -45,13 +45,7 @@ Main() {
     local progname
     progname="$(basename "$0")"
     local log=/home/liveuser/cachy-install.log
-    local mode=""
-
-    case "$progname" in
-        calamares-online.sh) mode=online ;;
-        calamares-offline.sh) mode=offline ;;
-    esac
-    mode=online  # keep this line for now!
+    local mode=online  # TODO: keep this line for now
 
     local _efi_check_dir="/sys/firmware/efi"
     local _exitcode=2 # by default use grub
@@ -73,6 +67,8 @@ Main() {
         SYSTEM="BIOS/MBR SYSTEM"
     fi
 
+    local ISO_VERSION="$(cat /etc/version-tag)"
+    echo "USING ISO VERSION: ${ISO_VERSION}"
 
     if [[ "${_exitcode}" -eq 2 ]]; then
         BOOTLOADER="GRUB"
@@ -107,7 +103,7 @@ Main() {
     cat <<EOF > $log
 ########## $log by $progname
 ########## Started (UTC): $(date -u "+%x %X")
-########## Install mode: $mode
+########## ISO version: $ISO_VERSION
 ########## System: $SYSTEM
 ########## Bootloader: $BOOTLOADER
 EOF
@@ -117,7 +113,7 @@ EOF
     sudo -E  dbus-launch calamares -D6 >> $log &
 
     # comment out the following line if pacman.log is not needed:
-    [ "$mode" = "online" ] && catch_chrooted_pacman_log "$progname"
+    catch_chrooted_pacman_log "$progname"
 }
 
 Main "$@"