Update

00_reset_1.sh

@@ -9,7 +9,7 @@ sudo rm -rf ./{work,out}
 #rm eosiso*.log
 mkdir ./{work,out}
 
-echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
+#echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
 notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

00_reset_2.sh

@@ -5,7 +5,7 @@ rm airootfs/root/packages/*.pkg.tar.*
 rm airootfs/usr/share/packages/*.pkg.tar.*
 mkdir ./{work,out}
 
-echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
+#echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
 notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

01_prepare.sh

@@ -26,7 +26,7 @@ refind \
 update-grub \
 xf86-video-intel
 
-echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
+#echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
 notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

03_make.sh

@@ -4,7 +4,12 @@ sudo ./mkarchiso_last_my -v "."
 rename=$(date +%Y-%m-%d)
 cp ./work/iso/arch/pkglist.x86_64.txt  ./out/Melawy-linux-${rename}-pkglist.txt
 
-echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
+#echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s
 notify-send -a "$(basename $(pwd)): Make" -t 999999999 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
+if [ -n "$files" ]; then
+    sudo chown -R 1000:1000 ./out
+    mv ./out/* ../boot/iso/
+fi
+
 echo "Ready"

04_move.sh

@@ -1,6 +1,10 @@
 #!/bin/bash
 
-sudo chown -R 1000:1000 ./out
-mv ./out/* ../boot/iso/
+files=$(ls -1 ./out)
+
+if [ -n "$files" ]; then
+    sudo chown -R 1000:1000 ./out
+    mv ./out/* ../boot/iso/
+fi
 
 echo "Ready"

airootfs/usr/local/bin/calamares-offline

@@ -15,7 +15,20 @@ EOF
 #     RunInTerminal "tail -f $log" &
 
     sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
-    sudo -E dbus-launch calamares -D6 >> $log
+
+    platform=$XDG_SESSION_TYPE
+
+    if [ -z $platform ]; then
+        platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
+
+        if [ -z $platform ]; then
+            sudo -E dbus-launch calamares -D6 >> $log
+        else
+            sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
+        fi
+
+    fi
+
 }
 
 Main "$@"

airootfs/usr/local/bin/calamares-online

@@ -90,7 +90,19 @@ EOF
 #     FollowFile "$log" "Install log" 20 20
 
     sudo cp /etc/calamares/settings_${mode}.conf /etc/calamares/settings.conf
-    sudo -E  dbus-launch calamares -D6 >> $log
+
+    platform=$XDG_SESSION_TYPE
+
+    if [ -z $platform ]; then
+        platform=$(loginctl show-session $(loginctl | grep $(whoami) | awk '{print $1}') -p Type | cut -d"=" -f 2)
+
+        if [ -z $platform ]; then
+            sudo -E dbus-launch calamares -D6 >> $log
+        else
+            sudo -E dbus-launch calamares -D6 -d -platform $platform >> $log
+        fi
+
+    fi
 
 #     &
 

airootfs/usr/local/bin/removeun

@@ -17,7 +17,7 @@ local _files_to_remove=(
 
 _clean_packages() {
 local _packages_to_remove=(
-  gparted
+  #gparted
   grsync
   cachyos-calamares-grub
   cachyos-calamares-systemd
@@ -45,7 +45,7 @@ local _packages_to_remove=(
   local _check_nvidia_card="$(chwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)"
   if [[ "${_check_nvidia_card}" -ne 0 ]]; then
     echo "No NVIDIA card detected. Removing nvidia drivers"
-    _packages_to_remove+=(nvidia-dkms nvidia-utils egl-wayland)
+    _packages_to_remove+=(nvidia-dkms nvidia-utils nvidia-settings egl-wayland)
   fi
 
   local xx

airootfs/usr/local/bin/removeun-online

@@ -16,7 +16,8 @@ _clean_packages() {
 #    local xxx
 #    for xxx in "${_toberemoved_packages[@]}"; do pacman -Rs "$xxx" --noconfirm; done
 
-    rm /etc/sddm.conf || true
+#     rm /etc/sddm.conf || true
+    true
 }
 
 _pacman_fix() {