This commit is contained in:
Valeria Fadeeva 2023-10-28 14:24:52 +05:00
parent 9c09c53438
commit 9bba6867bb
13 changed files with 39 additions and 36 deletions

View File

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

View File

@ -1,8 +1,8 @@
#!/bin/sh #!/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 mkdir ../work
notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" notify-send -a "$(basename $(pwd)): Reset" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"

View File

@ -33,6 +33,9 @@ do
sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" $pack sudo pacman -Sw --noconfirm --cachedir "./airootfs/usr/share/packages" $pack
done 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')" notify-send -a "$(basename $(pwd)): Prepare" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"
echo "Ready" echo "Ready"

View File

@ -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}" 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" sha1sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha1"
sha256sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha256" 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" echo "Ready"

View File

@ -1,12 +1,14 @@
#!/bin/bash #!/bin/bash
date_tag=$(date +%Y.%m.%d) date_tag=$(date +%Y.%m.%d)
iso_name="Melawy-linux-${date_tag}-x86_64.iso" 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}" 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" sha1sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha1"
sha256sum "../boot/iso/${iso_name}" > "../boot/txt/${iso_name}.sha256" 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')" notify-send -a "$(basename $(pwd)): Sign" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')"

View File

@ -15,30 +15,13 @@ Live environment will start now and let you install Melawy Linux to disk, or try
Bugs can be reported here: Bugs can be reported here:
https://github.com/Melawy 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: Our journey wouldn't be made possible without the donates:
https://melawy.ru/donate https://melawy.ru/donate
█▀▀▀▀▀█ ▀▀ █ ▄ █▀▀▀▀▀█
█ ███ █ █▄ █▀██▄▄ █ ███ █
█ ▀▀▀ █ ▀█▀▀▄▄█▀█ █ ▀▀▀ █
▀▀▀▀▀▀▀ ▀▄▀▄▀ █▄▀ ▀▀▀▀▀▀▀
█▀█▀ ▄▀ █▄ ▄▀ ▄▀ ▄▀▀▀▄▀
█▀ █ ▀▀█ ▄▄█▄▄ ▄ ▀█▄▄
███ █▀▀█▀▄█ ██▄ ██▄█ ▀▀█
▄▀ ▀█▀ █▀ █ ▀▄ ▀█▄█ ▀▀▄
▀▀▀▀▀▀█ ▀▀▄█ ██▀▀▀█▀█▀█
█▀▀▀▀▀█ ▀ ▀█ ▄█ ▀ █ ▀█▀
█ ███ █ ▄▀ ▀▄ █ ███▀██▄▄█
█ ▀▀▀ █ █▀▄▀█▄ █ ▀▀ █ █▀
▀▀▀▀▀▀▀ ▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀
Thank you for donating your trust in us! Thank you for donating your trust in us!
Welcome to your Melawy Linux Welcome to your Melawy Linux

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

@ -26,19 +26,20 @@ file_permissions=(
["/root"]="0:0:750" ["/root"]="0:0:750"
["/root/.automated_script"]="0:0:755" ["/root/.automated_script"]="0:0:755"
["/usr/bin/GPU-Intel-installer"]="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-offline"]="0:0:755"
["/usr/local/bin/calamares-online"]="0:0:755" ["/usr/local/bin/calamares-online"]="0:0:755"
["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755"
["/usr/local/bin/chrooted-cleaner-script"]="0:0:755" ["/usr/local/bin/chrooted-cleaner-script"]="0:0:755"
["/usr/local/bin/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_v1"]="0:0:755"
["/usr/local/bin/copy-refind-theme_v2"]="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/create-pacman-keyring"]="0:0:755"
["/usr/local/bin/dmcheck"]="0:0:755" ["/usr/local/bin/dmcheck"]="0:0:755"
["/usr/local/bin/fix-keys"]="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/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/prepare-live-desktop"]="0:0:755"
["/usr/local/bin/remove-ucode"]="0:0:755" ["/usr/local/bin/remove-ucode"]="0:0:755"
["/usr/local/bin/remove-unneeded"]="0:0:755" ["/usr/local/bin/remove-unneeded"]="0:0:755"