👷 cleanup

archiso/airootfs/usr/local/bin/calamares-offline.sh

@@ -2,7 +2,8 @@
 
 Main() {
     local mode=offline
-    local progname="$(basename "$0")"
+    local progname=""
+    progname="$(basename "$0")"
     local log=/home/liveuser/cachy-install.log
 
     cat <<EOF > $log

archiso/airootfs/usr/local/bin/calamares-online.sh

@@ -3,15 +3,13 @@
 FollowFile() {
     local tailfile="$1"
     local term_title="$2"
-    local xpos="$3"
-    local ypos="$4"
 
     alacritty -t "$term_title" -e tail -f "$tailfile" &
 }
 
 catch_chrooted_pacman_log() {
     local pacmanlog=""
-    local lockfile="$HOME/.$progname.lck"
+    local lockfile="$HOME/.$1.lck"
 
     # wait until pacman.log is available in the chrooted system, then follow the log in background
     while true ; do
@@ -28,7 +26,8 @@ catch_chrooted_pacman_log() {
 }
 
 Main() {
-    local progname="$(basename "$0")"
+    local progname
+    progname="$(basename "$0")"
     local log=/home/liveuser/cachy-install.log
     local mode=""
 
@@ -49,7 +48,7 @@ EOF
     pkexec calamares -style kvantum -d >> $log &
 
     # comment out the following line if pacman.log is not needed:
-    [ "$mode" = "online" ] && catch_chrooted_pacman_log
+    [ "$mode" = "online" ] && catch_chrooted_pacman_log "$progname"
 }
 
 Main "$@"

archiso/airootfs/usr/local/bin/remove-nvidia

@@ -7,7 +7,7 @@ kernel_cmdline(){
     for param in $(cat /proc/cmdline); do
         case "${param}" in
             $1=*) echo "${param##*=}"; return 0 ;;
-            $1) return 0 ;;
+            "$1") return 0 ;;
             *) continue ;;
         esac
     done
@@ -16,17 +16,17 @@ kernel_cmdline(){
 }
 
 get_driver(){
-    echo $(kernel_cmdline driver)
+    kernel_cmdline driver
 }
 
 get_virtmach(){
-    echo $(kernel_cmdline virtmach)
+    kernel_cmdline virtmach
 }
 
 while [ -e "/var/lib/pacman/db.lck" ];
 do
     echo 'Pacman is not ready yet. Will try again in 10 seconds.'
-    seconds=$(($seconds + 10))
+    seconds=$((seconds + 10))
     sleep 10
     if [[ "$seconds" == "30" ]]; then
         echo 'Warning: removing pacman db.lck!'
@@ -37,7 +37,7 @@ done
 # free = remove nvidia keep nouveau
 selection=$(get_driver)
 echo "#################################"
-echo "Selection was "$selection
+echo "Selection was ""$selection"
 echo "#################################"
 if [[ $selection == "free" ]]; then
     pacman -R --noconfirm nvidia-dkms nvidia-utils
@@ -46,7 +46,7 @@ fi
 #freenonouveau = remove nvidia and nouveau
 selection=$(get_driver)
 echo "#################################"
-echo "Selection was "$selection
+echo "Selection was ""$selection"
 echo "#################################"
 if [[ $selection == "freenonouveau" ]]; then
     pacman -R --noconfirm nvidia-dkms nvidia-utils
@@ -55,7 +55,7 @@ fi
 
 #nonfree = keepin nvidia and nouveau
 selection=$(get_driver)
-echo "Selection was "$selection
+echo "Selection was ""$selection"
 if [[ $selection == "nonfree" ]]; then
     echo "#################################"
     echo "We keep nvidia and nouveau onboard"
@@ -65,7 +65,7 @@ fi
 # nonfreenonouveau : keep nvidia and remove nouveau
 selection=$(get_driver)
 echo "#################################"
-echo "Selection was "$selection
+echo "Selection was ""$selection"
 echo "#################################"
 if [[ $selection == "nonfreenonouveau" ]]; then
     pacman -R --noconfirm xf86-video-nouveau
@@ -74,7 +74,7 @@ fi
 # remove virtual machines
 selection=$(get_virtmach)
 echo "#################################"
-echo "Selection was "$selection
+echo "Selection was ""$selection"
 echo "#################################"
 if [[ $selection == "none" ]]; then
 

archiso/airootfs/usr/local/bin/removeun-online

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-_clean_packages(){
+_clean_packages() {
     local _leave_these_packages="base\nbase-devel\ncachyos-keyring\ncachyos-mirrorlist\ncachyos-v3-mirrorlist\ncachyos-hello\ngrub\nefibootmgr\n"
     local _packages_to_remove=("$(comm -23 <(pacman -Qq | sort) <({ pacman -Qqg base-devel; printf "%s" $_leave_these_packages; } | sort -u))")
     local xx
@@ -11,4 +11,28 @@ _clean_packages(){
     rm /etc/sddm.conf || true
 }
 
+_try_v3() {
+    local pacman_conf="/etc/pacman.conf"
+    local pacman_conf_cachyos="/etc/pacman-more.conf"
+    local pacman_conf_path_backup="/etc/pacman.conf.bak"
+
+    if /lib/ld-linux-x86-64.so.2 --help | grep "x86-64-v3 (supported, searched)" > /dev/null; then
+        echo "x86-64-v3 is supported"
+
+        sed -i 's/Architecture = auto/#Architecture = auto/' $pacman_conf_cachyos
+        sed -i 's/#<disabled_v3>//g' $pacman_conf_cachyos
+
+        echo "backup old config"
+        mv $pacman_conf $pacman_conf_path_backup
+
+        echo "CachyOS -v3 Repo changed"
+        mv $pacman_conf_cachyos $pacman_conf
+
+    else
+        echo "x86-64-v3 is not supported"
+    fi
+
+}
+
 _clean_packages
+_try_v3