From 5d48267621bdc42c25220d7cc04240f2826cf577 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Thu, 19 Oct 2023 20:14:57 +0500 Subject: [PATCH] Update --- 00_reset_1.sh | 2 +- 00_reset_2.sh | 2 +- 01_prepare.sh | 2 +- 03_make.sh | 7 ++++++- 04_move.sh | 8 ++++++-- airootfs/root/archives/liveuser.tar.xz | Bin 58656 -> 58308 bytes airootfs/root/archives/skel.tar.xz | Bin 39896 -> 39596 bytes airootfs/usr/local/bin/calamares-offline | 15 ++++++++++++++- airootfs/usr/local/bin/calamares-online | 14 +++++++++++++- airootfs/usr/local/bin/removeun | 4 ++-- airootfs/usr/local/bin/removeun-online | 3 ++- 11 files changed, 46 insertions(+), 11 deletions(-) diff --git a/00_reset_1.sh b/00_reset_1.sh index cc4ee19..bd35cc8 100755 --- a/00_reset_1.sh +++ b/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" diff --git a/00_reset_2.sh b/00_reset_2.sh index 28eaced..2e4170b 100755 --- a/00_reset_2.sh +++ b/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" diff --git a/01_prepare.sh b/01_prepare.sh index f232212..4dd9f24 100755 --- a/01_prepare.sh +++ b/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" diff --git a/03_make.sh b/03_make.sh index f0d7cb5..59c96f1 100755 --- a/03_make.sh +++ b/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" diff --git a/04_move.sh b/04_move.sh index 6a511cd..95bc34c 100755 --- a/04_move.sh +++ b/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" diff --git a/airootfs/root/archives/liveuser.tar.xz b/airootfs/root/archives/liveuser.tar.xz index 6dc062627f0bc50b4c0e09735a3ea1a239ab5e40..bc778bd5ccc6105bcd00f2fd94f8fa2a9dfb6ff8 100644 GIT binary patch delta 9494 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 afSCFL0002Q2KoLJ7dtQm000001X)^Rgcer- diff --git a/airootfs/root/archives/skel.tar.xz b/airootfs/root/archives/skel.tar.xz index 6afc8a999d348e153a8ed61c9fe606e9d86047f7..658ac3637d08a4122ceb4aa36c66d0c88a59fbdc 100644 GIT binary patch delta 7236 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 I000D8T9;> $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 "$@" diff --git a/airootfs/usr/local/bin/calamares-online b/airootfs/usr/local/bin/calamares-online index dbfe303..c8c1750 100755 --- a/airootfs/usr/local/bin/calamares-online +++ b/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 # & diff --git a/airootfs/usr/local/bin/removeun b/airootfs/usr/local/bin/removeun index a841bc7..1a3391d 100755 --- a/airootfs/usr/local/bin/removeun +++ b/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 diff --git a/airootfs/usr/local/bin/removeun-online b/airootfs/usr/local/bin/removeun-online index a1df016..f9f7af3 100755 --- a/airootfs/usr/local/bin/removeun-online +++ b/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() {