Update

00_reset_light.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sudo rm -rf ../work
+sudo rm -rfv ../work
 mkdir ../work
 
 notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"

00_reset_with_packages.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
-sudo rm -rf ../work
+sudo rm -rfv ../work
-rm airootfs/opt/extra-drivers/*.pkg.tar.*
+rm -v airootfs/opt/extra-drivers/*.pkg.tar.*
-rm airootfs/root/packages/*.pkg.tar.*
+rm -v airootfs/root/packages/*.pkg.tar.*
-rm airootfs/usr/share/packages/*.pkg.tar.*
+rm -v airootfs/usr/share/packages/*.pkg.tar.*
 mkdir ../work
 
 notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"

01_prepare.sh

@@ -33,6 +33,9 @@ do
   sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" $pack
 done
 
+sudo paccache -rvk 1 --cachedir "./airootfs/opt/extra-drivers"
+sudo paccache -rvk 1 --cachedir "./airootfs/usr/share/packages"
+
 notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

03_make.sh

@@ -8,8 +8,8 @@ iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
 sha1sum     "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha1"
 sha256sum   "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha256"
-cp          "../boot/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
+cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
 
-notify-send -a "$(basename $(pwd)): Make" -t 999999999 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')"
+notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 
 echo "Ready"

04_sign.sh

@@ -1,12 +1,14 @@
 #!/bin/bash
 
+
+
 date_tag=$(date +%Y.%m.%d)
 iso_name="Melawy-linux-${date_tag}-x86_64.iso"
 
 gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "../boot/txt/${iso_name}.sig" "../boot/iso/${iso_name}"
 sha1sum     "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha1"
 sha256sum   "../boot/iso/${iso_name}"                                          > "../boot/txt/${iso_name}.sha256"
-cp          "../work/arch/pkglist.x86_64.txt"                                    "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
+cp          "../work/iso/arch/pkglist.x86_64.txt"                                "../boot/txt/Melawy-linux-${date_tag}-pkglist.txt"
 
 notify-send -a "$(basename $(pwd)): Sign" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
 

airootfs/etc/motd

@@ -15,30 +15,13 @@ Live environment will start now and let you install Melawy Linux to disk, or try
 Bugs can be reported here:
 https://github.com/Melawy
 
-Getting help: https://github.com/Melawy
+Getting help: https://Melawy.ru
-Chat is available on telegram: https://t.me/Melawy_chat
+Chat on telegram: https://t.me/Melawy_chat
-News is available on telegram: https://t.me/Melawy_news
+News on telegram: https://t.me/Melawy_news
 
 Our journey wouldn't be made possible without the donates:
 https://melawy.ru/donate
 
-
-
-      █▀▀▀▀▀█ ▀▀   █  ▄ █▀▀▀▀▀█
-      █ ███ █ █▄ █▀██▄▄ █ ███ █
-      █ ▀▀▀ █ ▀█▀▀▄▄█▀█ █ ▀▀▀ █
-      ▀▀▀▀▀▀▀ ▀▄▀▄▀ █▄▀ ▀▀▀▀▀▀▀
-      █▀█▀ ▄▀ █▄   ▄▀ ▄▀ ▄▀▀▀▄▀
-      █▀ █ ▀▀█  ▄▄█▄▄ ▄ ▀█▄▄
-      ███ █▀▀█▀▄█ ██▄ ██▄█ ▀▀█
-      ▄▀  ▀█▀  █▀ █ ▀▄ ▀█▄█ ▀▀▄
-      ▀▀▀▀▀▀█ ▀▀▄█ ██▀▀▀█▀█▀█
-      █▀▀▀▀▀█  ▀ ▀█  ▄█ ▀ █ ▀█▀
-      █ ███ █ ▄▀ ▀▄ █ ███▀██▄▄█
-      █ ▀▀▀ █ █▀▄▀█▄ █ ▀▀ █ █▀
-      ▀▀▀▀▀▀▀ ▀▀  ▀▀▀  ▀▀▀▀▀▀▀▀
-
-
 Thank you for donating your trust in us!
 
 Welcome to your Melawy Linux

airootfs/etc/pacman.conf

@@ -57,6 +57,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[cache]
+SigLevel = Optional
+Server = http://192.168.1.250/$repo/$arch
+
 # [core-testing]
 # Include = /etc/pacman.d/mirrorlist
 

airootfs/usr/local/bin/connection-checker

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+ping -c 1 1.1.1.1 > /dev/null
+if [ $? -eq 0 ]; then
+    true
+else
+    false
+fi

airootfs/usr/local/bin/update-mirrorlist

@@ -125,7 +125,7 @@ Main() {
 
     logterminal "version $VERSION"
 
-    /usr/bin/eos-connection-checker || {
+    /usr/local/bin/connection-checker || {
         logterminal "Internet connection is not available, cannot rank mirrorlist."
         return
     }

netinstall.yaml

@@ -28,7 +28,6 @@
     - melawy-dracut-initramfs
     - melawy-dracut-ukify
     - melawy-etc-skel-std-powerman-kvantum
-    - melawy-hooks
     - melawy-linux-keyring
     - melawy-linux-mirrorlist
     - melawy-refind-menu-generator
@@ -811,9 +810,9 @@
   critical: false
   packages:
     - linux
+    - linux-headers
     - linux-hardened
     - linux-hardened-headers
-    - linux-headers
     - linux-lqx
     - linux-lqx-headers
     - linux-lts

packages.x86_64

@@ -20,7 +20,6 @@ melawy-branding
 melawy-dracut-initramfs
 melawy-dracut-ukify
 melawy-etc-skel-std-powerman-kvantum
-melawy-hooks
 melawy-linux-keyring
 melawy-linux-mirrorlist
 melawy-refind-menu-generator

pacman.conf

@@ -57,6 +57,10 @@ Include = /etc/pacman.d/melawy-linux-mirrorlist
 [melawy-3party]
 Include = /etc/pacman.d/melawy-linux-mirrorlist
 
+[cache]
+SigLevel = Optional
+Server = http://192.168.1.250/$repo/$arch
+
 # [core-testing]
 # Include = /etc/pacman.d/mirrorlist
 

profiledef.sh

@@ -26,19 +26,20 @@ file_permissions=(
   ["/root"]="0:0:750"
   ["/root/.automated_script"]="0:0:755"
   ["/usr/bin/GPU-Intel-installer"]="0:0:755"
+  ["/usr/local/bin/Installation_guide"]="0:0:755"
   ["/usr/local/bin/calamares-offline"]="0:0:755"
   ["/usr/local/bin/calamares-online"]="0:0:755"
   ["/usr/local/bin/choose-mirror"]="0:0:755"
   ["/usr/local/bin/chrooted-cleaner-script"]="0:0:755"
   ["/usr/local/bin/cleaner-script"]="0:0:755"
+  ["/usr/local/bin/connection-checker"]="0:0:755"
   ["/usr/local/bin/copy-refind-theme_v1"]="0:0:755"
   ["/usr/local/bin/copy-refind-theme_v2"]="0:0:755"
   ["/usr/local/bin/create-pacman-keyring"]="0:0:755"
   ["/usr/local/bin/dmcheck"]="0:0:755"
   ["/usr/local/bin/fix-keys"]="0:0:755"
-  ["/usr/local/bin/Installation_guide"]="0:0:755"
   ["/usr/local/bin/livecd-sound"]="0:0:755"
-  ["/usr/local/bin/online-install-drivers"]="0:0:755"
+  ["/usr/local/bin/online-install-nvidia-drivers"]="0:0:755"
   ["/usr/local/bin/prepare-live-desktop"]="0:0:755"
   ["/usr/local/bin/remove-ucode"]="0:0:755"
   ["/usr/local/bin/remove-unneeded"]="0:0:755"