From 33b8cfb55f344fb966ea33d5e3551cc91adebe39 Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Mon, 6 Nov 2023 21:00:01 +0500 Subject: [PATCH] Update --- 3party/appimagelauncher | 1 + 3party/audio-recorder | 1 + 3party/bluetooth-autoconnect | 1 + 3party/bluetooth-support | 1 + 3party/btrfs-assistant | 1 + 3party/btrfs-snapshots | 1 + 3party/btrfsmaintenance | 1 + 3party/codelldb | 1 + 3party/find-the-command | 1 + 3party/gstreamer-meta | 1 + 3party/icu69-bin | 1 + 3party/input-devices-support | 1 + 3party/librist | 1 + 3party/linux-xanmod-anbox | 1 - 3party/mailspring | 1 + 3party/make.sh | 7 + 3party/media-downloader | 1 + 3party/noto-color-emoji-fontconfig | 1 + 3party/ocs-url | 1 + 3party/pace | 1 + 3party/paclast | 1 + 3party/pipewire-support | 1 + 3party/portainer-bin | 1 + 3party/preload | 1 + 3party/printer-support | 1 + 3party/pwd.txt | 1 + 3party/ramroot-btrfs | 1 + 3party/rate-mirrors | 1 + 3party/samba-support | 1 + 3party/scanner-support | 1 + 3party/timeshift | 1 + 3party/timeshift-autosnap | 1 + 3party/ttf-ms-fonts | 1 + 3party/ttf-twemoji | 1 + 3party/ventoy-bin | 1 + 3party/yandex-disk-indicator | 1 + Core/{melawy-hooks => grub-dracut}/.gitignore | 2 +- {3party/paru => Core/grub-dracut}/00_make.sh | 3 +- .../paru-bin => Core/grub-dracut}/01_sign.sh | 0 Core/grub-dracut/PKGBUILD | 33 +++++ Core/make.sh | 2 + Core/melawy-branding/00_make.sh | 2 +- Core/melawy-branding/PKGBUILD | 2 +- Core/melawy-branding/README.md | 2 +- Core/melawy-check-reboot-required/.gitignore | 4 + Core/melawy-check-reboot-required/00_make.sh | 25 ++++ .../melawy-check-reboot-required}/01_sign.sh | 0 .../PKGBUILD | 2 +- Core/melawy-check-reboot-required/README.md | 11 ++ Core/melawy-dracut-initramfs/00_make.sh | 2 +- Core/melawy-dracut-initramfs/PKGBUILD | 2 +- Core/melawy-dracut-ukify/00_make.sh | 2 +- Core/melawy-dracut-ukify/PKGBUILD | 2 +- Core/melawy-etc-skel-kvantum/00_make.sh | 2 +- Core/melawy-etc-skel-kvantum/PKGBUILD | 12 +- .../.gitignore | 2 +- .../00_make.sh | 2 +- .../PKGBUILD | 12 +- .../FETCH_HEAD | 2 +- .../refs/heads/main | 2 +- Core/melawy-etc-skel-std-powerman/.gitignore | 2 +- Core/melawy-etc-skel-std-powerman/00_make.sh | 2 +- Core/melawy-etc-skel-std-powerman/PKGBUILD | 12 +- .../melawy-etc-skel-std-powerman/FETCH_HEAD | 2 +- .../refs/heads/main | 2 +- Core/melawy-etc-skel/00_make.sh | 2 +- Core/melawy-etc-skel/PKGBUILD | 12 +- Core/melawy-linux-keyring/00_make.sh | 2 +- Core/melawy-linux-mirrorlist/00_make.sh | 2 +- Core/melawy-refind-menu-generator/00_make.sh | 2 +- Core/melawy-refind-menu-generator/PKGBUILD | 2 +- Core/melawy-skel-liveuser/00_make.sh | 2 +- Core/melawy-skel-liveuser/PKGBUILD | 16 +-- Core/melawy-skel-liveuser/ins.install | 10 +- .../melawy-skel-root}/.gitignore | 2 +- Core/melawy-skel-root/00_make.sh | 25 ++++ .../paru => Core/melawy-skel-root}/01_sign.sh | 0 Core/melawy-skel-root/PKGBUILD | 51 +++++++ .../README.md | 4 +- Core/melawy-skel-root/ins.install | 11 ++ Core/systemd-boot-dracut/.SRCINFO | 16 +++ Core/systemd-boot-dracut/.gitignore | 4 + Core/systemd-boot-dracut/00_make.sh | 25 ++++ .../01_sign.sh | 0 Core/systemd-boot-dracut/PKGBUILD | 33 +++++ .../00_make.sh | 2 +- .../melawy-plymouth-theme-fenek/00_make.sh | 2 +- .../00_make.sh | 2 +- .../melawy-refind-theme-fenek/00_make.sh | 2 +- .../Fenek/melawy-refind-theme-fenek/PKGBUILD | 2 +- .../Fenek/melawy-sddm-theme-fenek/00_make.sh | 2 +- .../Fenek/melawy-wallpaper-fenek/00_make.sh | 2 +- .../00_make.sh | 2 +- .../00_make.sh | 2 +- .../00_make.sh | 2 +- .../melawy-refind-theme-lera-sugar/00_make.sh | 2 +- .../melawy-refind-theme-lera-sugar/PKGBUILD | 2 +- .../melawy-sddm-theme-lera-sugar/00_make.sh | 2 +- .../melawy-wallpaper-lera-sugar/00_make.sh | 2 +- .../melawy-color-scheme-konsole/00_make.sh | 2 +- Design/Melawy/melawy-color-scheme/00_make.sh | 2 +- Design/Melawy/melawy-icon-theme/00_make.sh | 2 + .../melawy-plasma-desktop-theme/00_make.sh | 2 +- .../melawy-purple-dark-cursors/00_make.sh | 2 + .../00_make.sh | 2 + .../melawy-purple-light-cursors/00_make.sh | 2 + .../00_make.sh | 2 + .../Melawy/melawy-red-dark-cursors/00_make.sh | 2 + .../00_make.sh | 2 + .../melawy-red-light-cursors/00_make.sh | 2 + .../00_make.sh | 2 + .../00_make.sh | 2 +- .../00_make.sh | 2 +- .../melawy-plymouth-theme-nier-a2/00_make.sh | 2 +- .../melawy-refind-theme-nier-a2/00_make.sh | 2 +- .../melawy-refind-theme-nier-a2/PKGBUILD | 2 +- .../melawy-sddm-theme-nier-a2/00_make.sh | 2 +- .../melawy-wallpaper-nier-a2/00_make.sh | 2 +- Design/make.sh | 2 + Installer/make.sh | 2 + Installer/melawy-calamares-config/.gitignore | 4 + Installer/melawy-calamares-config/00_make.sh | 25 ++++ .../01_sign.sh | 0 Installer/melawy-calamares-config/PKGBUILD | 59 ++++++++ .../README.md | 2 +- Installer/melawy-calamares-qt5/.gitignore | 4 + .../melawy-calamares-qt5}/00_make.sh | 2 + .../01_sign.sh | 0 .../PKGBUILD | 90 ++++++++---- .../PKGBUILD_with_configs} | 74 ++++++++-- .../README.md | 0 .../лишнее.txt | 0 Installer/melawy-calamares-qt6/.gitignore | 2 +- Installer/melawy-calamares-qt6/00_make.sh | 3 +- Installer/melawy-calamares-qt6/01_sign.sh | 2 + Installer/melawy-calamares-qt6/PKGBUILD | 84 ++++++++--- Installer/melawy-calamares-qt6/PKGBUILD_6 | 119 ++++++++++++++++ .../PKGBUILD_with_configs | 130 ++++++++++++++++++ Installer/melawy-calamares_new/.gitignore | 4 - Installer/melawy-calamares_new/00_make.sh | 26 ---- Installer/melawy-welcome/00_make.sh | 2 + Installer/melawy-welcome/PKGBUILD | 2 +- Menu/make.sh | 2 + .../00_make.sh | 2 +- Menu/melawy-plasma-plasmoid-Menu11/00_make.sh | 2 +- .../00_make.sh | 2 +- Never/freeoffice | 1 + Never/make.sh | 67 +++++++++ {3party => Never}/paru-bin/.SRCINFO | 0 {3party => Never}/paru-bin/.gitignore | 0 .../paru-bin}/00_make.sh | 2 + Never/paru-bin/01_sign.sh | 21 +++ {3party => Never}/paru-bin/PKGBUILD | 0 {3party => Never}/paru-git/.SRCINFO | 0 {3party => Never}/paru-git/.gitignore | 0 .../paru-bin => Never/paru-git}/00_make.sh | 2 + Never/paru-git/01_sign.sh | 21 +++ {3party => Never}/paru-git/PKGBUILD | 0 {3party => Never}/paru/.SRCINFO | 0 {3party => Never}/paru/.gitignore | 0 {3party/paru-git => Never/paru}/00_make.sh | 2 + Never/paru/01_sign.sh | 21 +++ {3party => Never}/paru/PKGBUILD | 0 One_per_month/linux-xanmod-anbox | 1 + One_per_month/make.sh | 67 +++++++++ One_per_month/pwd.txt | 1 + Updater/make.sh | 2 + Updater/melawy-arch-linux-updater/00_make.sh | 2 + Updater/melawy-arch-linux-updater/PKGBUILD | 2 +- .../00_make.sh | 2 +- push.sh | 3 +- 171 files changed, 1155 insertions(+), 187 deletions(-) create mode 160000 3party/appimagelauncher create mode 160000 3party/audio-recorder create mode 160000 3party/bluetooth-autoconnect create mode 160000 3party/bluetooth-support create mode 160000 3party/btrfs-assistant create mode 160000 3party/btrfs-snapshots create mode 160000 3party/btrfsmaintenance create mode 160000 3party/codelldb create mode 160000 3party/find-the-command create mode 160000 3party/gstreamer-meta create mode 160000 3party/icu69-bin create mode 160000 3party/input-devices-support create mode 160000 3party/librist delete mode 160000 3party/linux-xanmod-anbox create mode 160000 3party/mailspring create mode 160000 3party/media-downloader create mode 160000 3party/noto-color-emoji-fontconfig create mode 160000 3party/ocs-url create mode 160000 3party/pace create mode 160000 3party/paclast create mode 160000 3party/pipewire-support create mode 160000 3party/portainer-bin create mode 160000 3party/preload create mode 160000 3party/printer-support create mode 100644 3party/pwd.txt create mode 160000 3party/ramroot-btrfs create mode 160000 3party/rate-mirrors create mode 160000 3party/samba-support create mode 160000 3party/scanner-support create mode 160000 3party/timeshift create mode 160000 3party/timeshift-autosnap create mode 160000 3party/ttf-ms-fonts create mode 160000 3party/ttf-twemoji create mode 160000 3party/ventoy-bin create mode 160000 3party/yandex-disk-indicator rename Core/{melawy-hooks => grub-dracut}/.gitignore (56%) rename {3party/paru => Core/grub-dracut}/00_make.sh (82%) rename {3party/paru-bin => Core/grub-dracut}/01_sign.sh (100%) create mode 100644 Core/grub-dracut/PKGBUILD create mode 100644 Core/melawy-check-reboot-required/.gitignore create mode 100755 Core/melawy-check-reboot-required/00_make.sh rename {3party/paru-git => Core/melawy-check-reboot-required}/01_sign.sh (100%) rename Core/{melawy-hooks => melawy-check-reboot-required}/PKGBUILD (98%) create mode 100644 Core/melawy-check-reboot-required/README.md rename {Installer/melawy-calamares => Core/melawy-skel-root}/.gitignore (50%) create mode 100755 Core/melawy-skel-root/00_make.sh rename {3party/paru => Core/melawy-skel-root}/01_sign.sh (100%) create mode 100644 Core/melawy-skel-root/PKGBUILD rename Core/{melawy-hooks => melawy-skel-root}/README.md (80%) create mode 100644 Core/melawy-skel-root/ins.install create mode 100644 Core/systemd-boot-dracut/.SRCINFO create mode 100644 Core/systemd-boot-dracut/.gitignore create mode 100755 Core/systemd-boot-dracut/00_make.sh rename Core/{melawy-hooks => systemd-boot-dracut}/01_sign.sh (100%) create mode 100644 Core/systemd-boot-dracut/PKGBUILD create mode 100644 Installer/melawy-calamares-config/.gitignore create mode 100755 Installer/melawy-calamares-config/00_make.sh rename Installer/{melawy-calamares => melawy-calamares-config}/01_sign.sh (100%) create mode 100644 Installer/melawy-calamares-config/PKGBUILD rename Installer/{melawy-calamares_new => melawy-calamares-config}/README.md (78%) create mode 100644 Installer/melawy-calamares-qt5/.gitignore rename {Core/melawy-hooks => Installer/melawy-calamares-qt5}/00_make.sh (98%) rename Installer/{melawy-calamares_new => melawy-calamares-qt5}/01_sign.sh (100%) rename Installer/{melawy-calamares => melawy-calamares-qt5}/PKGBUILD (57%) rename Installer/{melawy-calamares_new/PKGBUILD => melawy-calamares-qt5/PKGBUILD_with_configs} (77%) rename Installer/{melawy-calamares => melawy-calamares-qt5}/README.md (100%) rename Installer/{melawy-calamares_new => melawy-calamares-qt5}/лишнее.txt (100%) create mode 100644 Installer/melawy-calamares-qt6/PKGBUILD_6 create mode 100644 Installer/melawy-calamares-qt6/PKGBUILD_with_configs delete mode 100644 Installer/melawy-calamares_new/.gitignore delete mode 100755 Installer/melawy-calamares_new/00_make.sh create mode 160000 Never/freeoffice create mode 100755 Never/make.sh rename {3party => Never}/paru-bin/.SRCINFO (100%) rename {3party => Never}/paru-bin/.gitignore (100%) rename {Installer/melawy-calamares => Never/paru-bin}/00_make.sh (98%) create mode 100755 Never/paru-bin/01_sign.sh rename {3party => Never}/paru-bin/PKGBUILD (100%) rename {3party => Never}/paru-git/.SRCINFO (100%) rename {3party => Never}/paru-git/.gitignore (100%) rename {3party/paru-bin => Never/paru-git}/00_make.sh (98%) create mode 100755 Never/paru-git/01_sign.sh rename {3party => Never}/paru-git/PKGBUILD (100%) rename {3party => Never}/paru/.SRCINFO (100%) rename {3party => Never}/paru/.gitignore (100%) rename {3party/paru-git => Never/paru}/00_make.sh (98%) create mode 100755 Never/paru/01_sign.sh rename {3party => Never}/paru/PKGBUILD (100%) create mode 160000 One_per_month/linux-xanmod-anbox create mode 100755 One_per_month/make.sh create mode 100644 One_per_month/pwd.txt diff --git a/3party/appimagelauncher b/3party/appimagelauncher new file mode 160000 index 0000000..264ee4b --- /dev/null +++ b/3party/appimagelauncher @@ -0,0 +1 @@ +Subproject commit 264ee4bc760aa1154bf497314e50a8c7453fa5d0 diff --git a/3party/audio-recorder b/3party/audio-recorder new file mode 160000 index 0000000..f17452f --- /dev/null +++ b/3party/audio-recorder @@ -0,0 +1 @@ +Subproject commit f17452facb162f60a413df834c7a9055eae67cc3 diff --git a/3party/bluetooth-autoconnect b/3party/bluetooth-autoconnect new file mode 160000 index 0000000..1baf4ba --- /dev/null +++ b/3party/bluetooth-autoconnect @@ -0,0 +1 @@ +Subproject commit 1baf4ba3f9518309e0f80643bd364a91cc363ce4 diff --git a/3party/bluetooth-support b/3party/bluetooth-support new file mode 160000 index 0000000..969b23d --- /dev/null +++ b/3party/bluetooth-support @@ -0,0 +1 @@ +Subproject commit 969b23dbcba472a15adc0fb32deadec38f679ebc diff --git a/3party/btrfs-assistant b/3party/btrfs-assistant new file mode 160000 index 0000000..6d55029 --- /dev/null +++ b/3party/btrfs-assistant @@ -0,0 +1 @@ +Subproject commit 6d5502908ab71c1a705ac8677fdea15a82930013 diff --git a/3party/btrfs-snapshots b/3party/btrfs-snapshots new file mode 160000 index 0000000..c018d16 --- /dev/null +++ b/3party/btrfs-snapshots @@ -0,0 +1 @@ +Subproject commit c018d169c4c11e2a21a9c2d36282502e4348d3e4 diff --git a/3party/btrfsmaintenance b/3party/btrfsmaintenance new file mode 160000 index 0000000..4d79d6d --- /dev/null +++ b/3party/btrfsmaintenance @@ -0,0 +1 @@ +Subproject commit 4d79d6dadcc4f45b95bdb4105758bf34f7487f59 diff --git a/3party/codelldb b/3party/codelldb new file mode 160000 index 0000000..37c895e --- /dev/null +++ b/3party/codelldb @@ -0,0 +1 @@ +Subproject commit 37c895eeb4e8e672f1d55fb551926672a49624d3 diff --git a/3party/find-the-command b/3party/find-the-command new file mode 160000 index 0000000..cf62ddb --- /dev/null +++ b/3party/find-the-command @@ -0,0 +1 @@ +Subproject commit cf62ddb7652a308cf0575997c1547e4ec68d67d9 diff --git a/3party/gstreamer-meta b/3party/gstreamer-meta new file mode 160000 index 0000000..26decb6 --- /dev/null +++ b/3party/gstreamer-meta @@ -0,0 +1 @@ +Subproject commit 26decb613887afe9c86d46f3a81bb6826e705362 diff --git a/3party/icu69-bin b/3party/icu69-bin new file mode 160000 index 0000000..eaecf69 --- /dev/null +++ b/3party/icu69-bin @@ -0,0 +1 @@ +Subproject commit eaecf69494ad6c97afcfa6b8f4ed2726c76a7dea diff --git a/3party/input-devices-support b/3party/input-devices-support new file mode 160000 index 0000000..d70fad3 --- /dev/null +++ b/3party/input-devices-support @@ -0,0 +1 @@ +Subproject commit d70fad31c18929f3f48ba545ac274701461f68e3 diff --git a/3party/librist b/3party/librist new file mode 160000 index 0000000..b6616f8 --- /dev/null +++ b/3party/librist @@ -0,0 +1 @@ +Subproject commit b6616f8f35fced6120321cf1432ac9be5018a390 diff --git a/3party/linux-xanmod-anbox b/3party/linux-xanmod-anbox deleted file mode 160000 index 3143a9e..0000000 --- a/3party/linux-xanmod-anbox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3143a9e63f52ee8bfec93165e4d9ccd89d824798 diff --git a/3party/mailspring b/3party/mailspring new file mode 160000 index 0000000..7ddb8ff --- /dev/null +++ b/3party/mailspring @@ -0,0 +1 @@ +Subproject commit 7ddb8fff4e44dca7605aa8e097b485ba1c2924e6 diff --git a/3party/make.sh b/3party/make.sh index 165b014..cd79738 100755 --- a/3party/make.sh +++ b/3party/make.sh @@ -1,5 +1,9 @@ #!/bin/bash +find . -type f -name "*.xz" -delete +find . -type f -name "*.zst" -delete +find . -type f -name "*.sig" -delete + REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt @@ -9,6 +13,7 @@ CWD=$(cat pwd.txt) for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) do cd $CWD/$package_dir + git pull makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force for i in *.pkg.tar.zst; @@ -58,3 +63,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/3party/media-downloader b/3party/media-downloader new file mode 160000 index 0000000..f60f713 --- /dev/null +++ b/3party/media-downloader @@ -0,0 +1 @@ +Subproject commit f60f713623f2eef26b4b9728e1c25e3ba140b8aa diff --git a/3party/noto-color-emoji-fontconfig b/3party/noto-color-emoji-fontconfig new file mode 160000 index 0000000..f0677d4 --- /dev/null +++ b/3party/noto-color-emoji-fontconfig @@ -0,0 +1 @@ +Subproject commit f0677d458d56acf9f7665bb1e82b90ba6a497b06 diff --git a/3party/ocs-url b/3party/ocs-url new file mode 160000 index 0000000..2576545 --- /dev/null +++ b/3party/ocs-url @@ -0,0 +1 @@ +Subproject commit 2576545f24fab8340a69e4f7452f7b1b6a30c761 diff --git a/3party/pace b/3party/pace new file mode 160000 index 0000000..3908804 --- /dev/null +++ b/3party/pace @@ -0,0 +1 @@ +Subproject commit 3908804e10092616e02aabbd9c30551798b118b0 diff --git a/3party/paclast b/3party/paclast new file mode 160000 index 0000000..6fd9a9e --- /dev/null +++ b/3party/paclast @@ -0,0 +1 @@ +Subproject commit 6fd9a9e2cbe68bb5da010bb3c1320c4965b3d4ee diff --git a/3party/pipewire-support b/3party/pipewire-support new file mode 160000 index 0000000..52bf736 --- /dev/null +++ b/3party/pipewire-support @@ -0,0 +1 @@ +Subproject commit 52bf736ed2632303e44af97edb8c0b7e1b88fca4 diff --git a/3party/portainer-bin b/3party/portainer-bin new file mode 160000 index 0000000..3064f8e --- /dev/null +++ b/3party/portainer-bin @@ -0,0 +1 @@ +Subproject commit 3064f8e3f2e27aef895e39abbf5f6069ba80b836 diff --git a/3party/preload b/3party/preload new file mode 160000 index 0000000..0636f6b --- /dev/null +++ b/3party/preload @@ -0,0 +1 @@ +Subproject commit 0636f6b3ff0a4b54640b3e5652429d52a767eb59 diff --git a/3party/printer-support b/3party/printer-support new file mode 160000 index 0000000..a04201d --- /dev/null +++ b/3party/printer-support @@ -0,0 +1 @@ +Subproject commit a04201d28847d7effab68c69d1f4e323d72537c7 diff --git a/3party/pwd.txt b/3party/pwd.txt new file mode 100644 index 0000000..555ed6d --- /dev/null +++ b/3party/pwd.txt @@ -0,0 +1 @@ +/data/github/active/Melawy/PKGBUILD-git.melawy.ru/3party \ No newline at end of file diff --git a/3party/ramroot-btrfs b/3party/ramroot-btrfs new file mode 160000 index 0000000..fd91310 --- /dev/null +++ b/3party/ramroot-btrfs @@ -0,0 +1 @@ +Subproject commit fd91310ea12aaa0066b8ed9891c7524bc58f35a2 diff --git a/3party/rate-mirrors b/3party/rate-mirrors new file mode 160000 index 0000000..8eadde5 --- /dev/null +++ b/3party/rate-mirrors @@ -0,0 +1 @@ +Subproject commit 8eadde526582e6d939722a5c7e85bc5fef1d3c78 diff --git a/3party/samba-support b/3party/samba-support new file mode 160000 index 0000000..12af7bc --- /dev/null +++ b/3party/samba-support @@ -0,0 +1 @@ +Subproject commit 12af7bc65342fabb321f5b2924e57ff2e73aa948 diff --git a/3party/scanner-support b/3party/scanner-support new file mode 160000 index 0000000..8b77fb5 --- /dev/null +++ b/3party/scanner-support @@ -0,0 +1 @@ +Subproject commit 8b77fb59be9de1660c9b296f30d7beeb067421c6 diff --git a/3party/timeshift b/3party/timeshift new file mode 160000 index 0000000..6f81bb3 --- /dev/null +++ b/3party/timeshift @@ -0,0 +1 @@ +Subproject commit 6f81bb3415aa21be3a027a5909817ae0120197a5 diff --git a/3party/timeshift-autosnap b/3party/timeshift-autosnap new file mode 160000 index 0000000..2b779f4 --- /dev/null +++ b/3party/timeshift-autosnap @@ -0,0 +1 @@ +Subproject commit 2b779f48394cc2a08d90c9e1770eb2f8a8258a96 diff --git a/3party/ttf-ms-fonts b/3party/ttf-ms-fonts new file mode 160000 index 0000000..4b3621d --- /dev/null +++ b/3party/ttf-ms-fonts @@ -0,0 +1 @@ +Subproject commit 4b3621d776c7090b7d42ff53e1aa0170e16477e5 diff --git a/3party/ttf-twemoji b/3party/ttf-twemoji new file mode 160000 index 0000000..cdd3a3d --- /dev/null +++ b/3party/ttf-twemoji @@ -0,0 +1 @@ +Subproject commit cdd3a3d28d4270867d140bb45f4cdde76a3bd6ec diff --git a/3party/ventoy-bin b/3party/ventoy-bin new file mode 160000 index 0000000..41f096b --- /dev/null +++ b/3party/ventoy-bin @@ -0,0 +1 @@ +Subproject commit 41f096b8a96ed09b9e1c9d26d90879c4c4d45160 diff --git a/3party/yandex-disk-indicator b/3party/yandex-disk-indicator new file mode 160000 index 0000000..df08743 --- /dev/null +++ b/3party/yandex-disk-indicator @@ -0,0 +1 @@ +Subproject commit df087438f846de950ba59177bca2f03061901f4d diff --git a/Core/melawy-hooks/.gitignore b/Core/grub-dracut/.gitignore similarity index 56% rename from Core/melawy-hooks/.gitignore rename to Core/grub-dracut/.gitignore index b209499..bc268c6 100644 --- a/Core/melawy-hooks/.gitignore +++ b/Core/grub-dracut/.gitignore @@ -1,4 +1,4 @@ *.tar.* pkg/ src/ -/melawy-hooks +/grub-dracut diff --git a/3party/paru/00_make.sh b/Core/grub-dracut/00_make.sh similarity index 82% rename from 3party/paru/00_make.sh rename to Core/grub-dracut/00_make.sh index 5b1364e..122f2f7 100755 --- a/3party/paru/00_make.sh +++ b/Core/grub-dracut/00_make.sh @@ -22,5 +22,4 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/3party/paru-bin/01_sign.sh b/Core/grub-dracut/01_sign.sh similarity index 100% rename from 3party/paru-bin/01_sign.sh rename to Core/grub-dracut/01_sign.sh diff --git a/Core/grub-dracut/PKGBUILD b/Core/grub-dracut/PKGBUILD new file mode 100644 index 0000000..907cd18 --- /dev/null +++ b/Core/grub-dracut/PKGBUILD @@ -0,0 +1,33 @@ +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.2.1 +pkgrel=1 +pkgdesc="Enables grub boot automation using kernel-install with dracut" +arch=(any) +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=("BSD") +depends=("dracut") +optdepends=() +makedepends=("git") +backup=("etc/grub-dracut.conf") +provides=("${pkgname}") +conflicts=("${pkgname}" "mkinitcpio" "kernel-install-mkinitcpio" "kernel-install-for-dracut" "dracut-hook") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") + +# pkgver() { +# cd "$srcdir/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +pkgver() { + cd "$srcdir/$_gitname" + printf "1.2.%s" "$(git rev-list --count HEAD)" +} + +package() +{ + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/etc" "$pkgdir/" + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/" +} diff --git a/Core/make.sh b/Core/make.sh index a7a627b..608bc65 100755 --- a/Core/make.sh +++ b/Core/make.sh @@ -58,3 +58,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Core/melawy-branding/00_make.sh b/Core/melawy-branding/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-branding/00_make.sh +++ b/Core/melawy-branding/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-branding/PKGBUILD b/Core/melawy-branding/PKGBUILD index d5a017c..a020f3d 100644 --- a/Core/melawy-branding/PKGBUILD +++ b/Core/melawy-branding/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.8 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Core/melawy-branding/README.md b/Core/melawy-branding/README.md index fb2d7b8..bb774d3 100644 --- a/Core/melawy-branding/README.md +++ b/Core/melawy-branding/README.md @@ -1,5 +1,5 @@ # melawy-branding -Logo, logo in KDE Infocenter (About), liveuser avatar +Logo, logo in KDE Infocenter (About), liveuser avatar, lsb-release, os-release ### Donate [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) diff --git a/Core/melawy-check-reboot-required/.gitignore b/Core/melawy-check-reboot-required/.gitignore new file mode 100644 index 0000000..fe380c5 --- /dev/null +++ b/Core/melawy-check-reboot-required/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-check-reboot-required diff --git a/Core/melawy-check-reboot-required/00_make.sh b/Core/melawy-check-reboot-required/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Core/melawy-check-reboot-required/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/3party/paru-git/01_sign.sh b/Core/melawy-check-reboot-required/01_sign.sh similarity index 100% rename from 3party/paru-git/01_sign.sh rename to Core/melawy-check-reboot-required/01_sign.sh diff --git a/Core/melawy-hooks/PKGBUILD b/Core/melawy-check-reboot-required/PKGBUILD similarity index 98% rename from Core/melawy-hooks/PKGBUILD rename to Core/melawy-check-reboot-required/PKGBUILD index b83824e..1076273 100644 --- a/Core/melawy-hooks/PKGBUILD +++ b/Core/melawy-check-reboot-required/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Core/melawy-check-reboot-required/README.md b/Core/melawy-check-reboot-required/README.md new file mode 100644 index 0000000..c74ec24 --- /dev/null +++ b/Core/melawy-check-reboot-required/README.md @@ -0,0 +1,11 @@ +# melawy-check-reboot-required +Check reboot required after install or upgrade packages + +### Donate +[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) + +[YooMoney](https://yoomoney.ru/to/4100115921160758) + +[Qiwi](https://qiwi.com/n/VALERIAFADEEVA) + +Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f diff --git a/Core/melawy-dracut-initramfs/00_make.sh b/Core/melawy-dracut-initramfs/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-dracut-initramfs/00_make.sh +++ b/Core/melawy-dracut-initramfs/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-dracut-initramfs/PKGBUILD b/Core/melawy-dracut-initramfs/PKGBUILD index b5977df..7556d07 100644 --- a/Core/melawy-dracut-initramfs/PKGBUILD +++ b/Core/melawy-dracut-initramfs/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.20 +pkgver=1.21 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Core/melawy-dracut-ukify/00_make.sh b/Core/melawy-dracut-ukify/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-dracut-ukify/00_make.sh +++ b/Core/melawy-dracut-ukify/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-dracut-ukify/PKGBUILD b/Core/melawy-dracut-ukify/PKGBUILD index aa81f82..f193451 100644 --- a/Core/melawy-dracut-ukify/PKGBUILD +++ b/Core/melawy-dracut-ukify/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.23 +pkgver=1.24 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Core/melawy-etc-skel-kvantum/00_make.sh b/Core/melawy-etc-skel-kvantum/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-etc-skel-kvantum/00_make.sh +++ b/Core/melawy-etc-skel-kvantum/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-etc-skel-kvantum/PKGBUILD b/Core/melawy-etc-skel-kvantum/PKGBUILD index c760737..548ce06 100644 --- a/Core/melawy-etc-skel-kvantum/PKGBUILD +++ b/Core/melawy-etc-skel-kvantum/PKGBUILD @@ -2,16 +2,16 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') +arch=("any") url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('AGPL3') +license=("AGPL3") -depends=('bash') +depends=("bash") -makedepends=('git') +makedepends=("git") optdepends=() @@ -41,7 +41,7 @@ package() { cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/usr/share/skel/" # Find all scripts - readarray -d '' scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) # Make scripts executable for script in "${scripts[@]}"; diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/.gitignore b/Core/melawy-etc-skel-std-powerman-kvantum/.gitignore index 6a6e524..7d166d8 100644 --- a/Core/melawy-etc-skel-std-powerman-kvantum/.gitignore +++ b/Core/melawy-etc-skel-std-powerman-kvantum/.gitignore @@ -1,4 +1,4 @@ *.tar.* pkg/ src/ -/melawy-skel-std-powerman-kvantum +/melawy-etc-skel-std-powerman-kvantum diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/00_make.sh b/Core/melawy-etc-skel-std-powerman-kvantum/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-etc-skel-std-powerman-kvantum/00_make.sh +++ b/Core/melawy-etc-skel-std-powerman-kvantum/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD b/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD index c760737..548ce06 100644 --- a/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD +++ b/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD @@ -2,16 +2,16 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') +arch=("any") url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('AGPL3') +license=("AGPL3") -depends=('bash') +depends=("bash") -makedepends=('git') +makedepends=("git") optdepends=() @@ -41,7 +41,7 @@ package() { cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/usr/share/skel/" # Find all scripts - readarray -d '' scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) # Make scripts executable for script in "${scripts[@]}"; diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/FETCH_HEAD b/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/FETCH_HEAD index 2405f93..b109416 100644 --- a/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/FETCH_HEAD +++ b/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/FETCH_HEAD @@ -1 +1 @@ -c5072a25f11ccf39d3f7691127879224dcec85f4 not-for-merge branch 'main' of https://git.melawy.ru/Melawy-Linux/melawy-etc-skel-std-powerman-kvantum +377ab0dbb61f2e1e9d267982f427cee49b1ef355 not-for-merge branch 'main' of https://git.melawy.ru/Melawy-Linux/melawy-etc-skel-std-powerman-kvantum diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/refs/heads/main b/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/refs/heads/main index 9af8c58..6a6b6a9 100644 --- a/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/refs/heads/main +++ b/Core/melawy-etc-skel-std-powerman-kvantum/melawy-etc-skel-std-powerman-kvantum/refs/heads/main @@ -1 +1 @@ -c5072a25f11ccf39d3f7691127879224dcec85f4 +377ab0dbb61f2e1e9d267982f427cee49b1ef355 diff --git a/Core/melawy-etc-skel-std-powerman/.gitignore b/Core/melawy-etc-skel-std-powerman/.gitignore index dc99bbf..8e4bc81 100644 --- a/Core/melawy-etc-skel-std-powerman/.gitignore +++ b/Core/melawy-etc-skel-std-powerman/.gitignore @@ -1,4 +1,4 @@ *.tar.* pkg/ src/ -/melawy-skel-std-powerman +/melawy-etc-skel-std-powerman diff --git a/Core/melawy-etc-skel-std-powerman/00_make.sh b/Core/melawy-etc-skel-std-powerman/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-etc-skel-std-powerman/00_make.sh +++ b/Core/melawy-etc-skel-std-powerman/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-etc-skel-std-powerman/PKGBUILD b/Core/melawy-etc-skel-std-powerman/PKGBUILD index bda0f9d..30ef30e 100644 --- a/Core/melawy-etc-skel-std-powerman/PKGBUILD +++ b/Core/melawy-etc-skel-std-powerman/PKGBUILD @@ -2,16 +2,16 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') +arch=("any") url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('AGPL3') +license=("AGPL3") -depends=('bash') +depends=("bash") -makedepends=('git') +makedepends=("git") optdepends=() @@ -41,7 +41,7 @@ package() { cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/usr/share/skel/" # Find all scripts - readarray -d '' scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) # Make scripts executable for script in "${scripts[@]}"; diff --git a/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/FETCH_HEAD b/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/FETCH_HEAD index 75082ae..5d1fa22 100644 --- a/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/FETCH_HEAD +++ b/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/FETCH_HEAD @@ -1 +1 @@ -3833239dc0dfc2a0637a7d40b72809af691f1cee not-for-merge branch 'main' of https://git.melawy.ru/Melawy-Linux/melawy-etc-skel-std-powerman +7ed2c8cb6f9b8de3d0ff84c8adae37949ede1085 not-for-merge branch 'main' of https://git.melawy.ru/Melawy-Linux/melawy-etc-skel-std-powerman diff --git a/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/refs/heads/main b/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/refs/heads/main index efe320a..b23af17 100644 --- a/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/refs/heads/main +++ b/Core/melawy-etc-skel-std-powerman/melawy-etc-skel-std-powerman/refs/heads/main @@ -1 +1 @@ -3833239dc0dfc2a0637a7d40b72809af691f1cee +7ed2c8cb6f9b8de3d0ff84c8adae37949ede1085 diff --git a/Core/melawy-etc-skel/00_make.sh b/Core/melawy-etc-skel/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-etc-skel/00_make.sh +++ b/Core/melawy-etc-skel/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-etc-skel/PKGBUILD b/Core/melawy-etc-skel/PKGBUILD index bda0f9d..30ef30e 100644 --- a/Core/melawy-etc-skel/PKGBUILD +++ b/Core/melawy-etc-skel/PKGBUILD @@ -2,16 +2,16 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') +arch=("any") url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('AGPL3') +license=("AGPL3") -depends=('bash') +depends=("bash") -makedepends=('git') +makedepends=("git") optdepends=() @@ -41,7 +41,7 @@ package() { cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/skel/" "${pkgdir}/usr/share/skel/" # Find all scripts - readarray -d '' scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) # Make scripts executable for script in "${scripts[@]}"; diff --git a/Core/melawy-linux-keyring/00_make.sh b/Core/melawy-linux-keyring/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-linux-keyring/00_make.sh +++ b/Core/melawy-linux-keyring/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-linux-mirrorlist/00_make.sh b/Core/melawy-linux-mirrorlist/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-linux-mirrorlist/00_make.sh +++ b/Core/melawy-linux-mirrorlist/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-refind-menu-generator/00_make.sh b/Core/melawy-refind-menu-generator/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-refind-menu-generator/00_make.sh +++ b/Core/melawy-refind-menu-generator/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-refind-menu-generator/PKGBUILD b/Core/melawy-refind-menu-generator/PKGBUILD index ced8c28..8326ce7 100644 --- a/Core/melawy-refind-menu-generator/PKGBUILD +++ b/Core/melawy-refind-menu-generator/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.26 +pkgver=1.29 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Core/melawy-skel-liveuser/00_make.sh b/Core/melawy-skel-liveuser/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Core/melawy-skel-liveuser/00_make.sh +++ b/Core/melawy-skel-liveuser/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Core/melawy-skel-liveuser/PKGBUILD b/Core/melawy-skel-liveuser/PKGBUILD index 6b890bd..559a7b9 100644 --- a/Core/melawy-skel-liveuser/PKGBUILD +++ b/Core/melawy-skel-liveuser/PKGBUILD @@ -2,16 +2,16 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.7 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') +arch=("any") url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('AGPL3') +license=("AGPL3") -depends=() +depends=("bash") -makedepends=('git') +makedepends=("git") optdepends=() @@ -37,11 +37,11 @@ install=ins.install package() { # Clone file structure - install -d "${pkgdir}/home/" - cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/liveuser/" "${pkgdir}/home/liveuser/" + install -d "${pkgdir}/usr/share/skel-liveuser/" + cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/liveuser/" "${pkgdir}/usr/share/skel-liveuser/" # Find all scripts - readarray -d '' scripts < <(find "${pkgdir}/home/liveuser" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel-liveuser" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) # Make scripts executable for script in "${scripts[@]}"; diff --git a/Core/melawy-skel-liveuser/ins.install b/Core/melawy-skel-liveuser/ins.install index 2d92347..f31e9ae 100644 --- a/Core/melawy-skel-liveuser/ins.install +++ b/Core/melawy-skel-liveuser/ins.install @@ -1,7 +1,11 @@ -post_install() { +post_upgrade() { + if [ ! -d /home/liveuser ]; then + mkdir -p /home/liveuser + fi + cp -vrT --no-preserve=ownership "/usr/share/skel-liveuser/" "/home/liveuser/" chown -Rh 1000:1000 /home/liveuser } -post_upgrade() { - post_install +post_install() { + post_upgrade } diff --git a/Installer/melawy-calamares/.gitignore b/Core/melawy-skel-root/.gitignore similarity index 50% rename from Installer/melawy-calamares/.gitignore rename to Core/melawy-skel-root/.gitignore index 0ee13a0..9fbd810 100644 --- a/Installer/melawy-calamares/.gitignore +++ b/Core/melawy-skel-root/.gitignore @@ -1,4 +1,4 @@ *.tar.* pkg/ src/ -/melawy-calamares +/melawy-skel-root diff --git a/Core/melawy-skel-root/00_make.sh b/Core/melawy-skel-root/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Core/melawy-skel-root/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/3party/paru/01_sign.sh b/Core/melawy-skel-root/01_sign.sh similarity index 100% rename from 3party/paru/01_sign.sh rename to Core/melawy-skel-root/01_sign.sh diff --git a/Core/melawy-skel-root/PKGBUILD b/Core/melawy-skel-root/PKGBUILD new file mode 100644 index 0000000..ab8ac59 --- /dev/null +++ b/Core/melawy-skel-root/PKGBUILD @@ -0,0 +1,51 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.7 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=("any") +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=("AGPL3") + +depends=("bash") + +makedepends=("git") + +optdepends=() + +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +options=() +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") + +# pkgver() { +# cd "$srcdir/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +pkgver() { + cd "${srcdir}/${_gitname}" + printf "1.%s" "$(git rev-list --count HEAD)" +} + +install=ins.install + +package() { + # Clone file structure + install -d "${pkgdir}/usr/share/skel-root/" + cp -rT --no-preserve=ownership "${srcdir}/${_gitname}/root/" "${pkgdir}/usr/share/skel-root/" + + # Find all scripts + readarray -d "" scripts < <(find "${pkgdir}/usr/share/skel-root" -type f \( -iname "*.sh" -o -iname "*.bash" \) -print0) + + # Make scripts executable + for script in "${scripts[@]}"; + do + [[ -f ${script} ]] && chmod +x "${script}" + done +} diff --git a/Core/melawy-hooks/README.md b/Core/melawy-skel-root/README.md similarity index 80% rename from Core/melawy-hooks/README.md rename to Core/melawy-skel-root/README.md index 357649a..baaec9a 100644 --- a/Core/melawy-hooks/README.md +++ b/Core/melawy-skel-root/README.md @@ -1,5 +1,5 @@ -# melawy-hooks -lsb-release, os-release +# skel-root +Root specific skel setup for Melawy Linux ### Donate [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) diff --git a/Core/melawy-skel-root/ins.install b/Core/melawy-skel-root/ins.install new file mode 100644 index 0000000..894afaf --- /dev/null +++ b/Core/melawy-skel-root/ins.install @@ -0,0 +1,11 @@ +post_upgrade() { + if [ ! -d /root ]; then + mkdir -p /root + fi + cp -vrT --no-preserve=ownership "/usr/share/skel-root/" "/root/" + chown -Rh 0:0 /root +} + +post_install() { + post_upgrade +} diff --git a/Core/systemd-boot-dracut/.SRCINFO b/Core/systemd-boot-dracut/.SRCINFO new file mode 100644 index 0000000..f3971c7 --- /dev/null +++ b/Core/systemd-boot-dracut/.SRCINFO @@ -0,0 +1,16 @@ +pkgbase = kernel-install-for-dracut + pkgdesc = Enables systemd-boot automation using kernel-install with dracut + pkgver = 1.9.1 + pkgrel = 1 + url = https://gitlab.com/dalto.8/kernel-install-for-dracut + arch = any + license = GPL2 + depends = dracut + conflicts = mkinitcpio + conflicts = kernel-install-mkinitcpio + backup = etc/kernel/install.d/50-dracut.install + backup = etc/kernel-install-for-dracut.conf + source = kernel-install-for-dracut-1.9.1.tar.gz::https://gitlab.com/dalto.8/kernel-install-for-dracut/-/archive/1.9.1/kernel-install-for-dracut-1.9.1.tar.gz + sha256sums = 1f7e6908388e862849bd7e78504c91dd2a8a3dba8a75dc26e9d4ede038099c3d + +pkgname = kernel-install-for-dracut diff --git a/Core/systemd-boot-dracut/.gitignore b/Core/systemd-boot-dracut/.gitignore new file mode 100644 index 0000000..22afcff --- /dev/null +++ b/Core/systemd-boot-dracut/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/systemd-boot-dracut diff --git a/Core/systemd-boot-dracut/00_make.sh b/Core/systemd-boot-dracut/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Core/systemd-boot-dracut/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Core/melawy-hooks/01_sign.sh b/Core/systemd-boot-dracut/01_sign.sh similarity index 100% rename from Core/melawy-hooks/01_sign.sh rename to Core/systemd-boot-dracut/01_sign.sh diff --git a/Core/systemd-boot-dracut/PKGBUILD b/Core/systemd-boot-dracut/PKGBUILD new file mode 100644 index 0000000..8d49d3b --- /dev/null +++ b/Core/systemd-boot-dracut/PKGBUILD @@ -0,0 +1,33 @@ +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.9.1.19 +pkgrel=1 +pkgdesc="Enables systemd-boot automation using kernel-install with dracut" +arch=(any) +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=("AGPL3") +depends=("dracut") +optdepends=() +makedepends=("git") +backup=("etc/kernel/install.d/50-dracut.install" "etc/kernel-install-for-dracut.conf") +provides=("${pkgname}") +conflicts=("${pkgname}" "mkinitcpio" "kernel-install-mkinitcpio" "kernel-install-for-dracut") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") + +# pkgver() { +# cd "$srcdir/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +pkgver() { + cd "$srcdir/$_gitname" + printf "1.9.1.%s" "$(git rev-list --count HEAD)" +} + +package() +{ + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/etc" "$pkgdir/" + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/" +} diff --git a/Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh b/Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh +++ b/Design/Fenek/melawy-plasma-look-and-feel-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh b/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh +++ b/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh +++ b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Fenek/melawy-refind-theme-fenek/00_make.sh b/Design/Fenek/melawy-refind-theme-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-refind-theme-fenek/00_make.sh +++ b/Design/Fenek/melawy-refind-theme-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD b/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD index e50d845..3848b85 100644 --- a/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD +++ b/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.3 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Design/Fenek/melawy-sddm-theme-fenek/00_make.sh b/Design/Fenek/melawy-sddm-theme-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-sddm-theme-fenek/00_make.sh +++ b/Design/Fenek/melawy-sddm-theme-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Fenek/melawy-wallpaper-fenek/00_make.sh b/Design/Fenek/melawy-wallpaper-fenek/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Fenek/melawy-wallpaper-fenek/00_make.sh +++ b/Design/Fenek/melawy-wallpaper-fenek/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-plasma-look-and-feel-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD index a5a8747..e5c8a6a 100644 --- a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.9 +pkgver=1.10 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-sddm-theme-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh +++ b/Design/Lera-Sugar/melawy-wallpaper-lera-sugar/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Melawy/melawy-color-scheme-konsole/00_make.sh b/Design/Melawy/melawy-color-scheme-konsole/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Melawy/melawy-color-scheme-konsole/00_make.sh +++ b/Design/Melawy/melawy-color-scheme-konsole/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Melawy/melawy-color-scheme/00_make.sh b/Design/Melawy/melawy-color-scheme/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Melawy/melawy-color-scheme/00_make.sh +++ b/Design/Melawy/melawy-color-scheme/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Melawy/melawy-icon-theme/00_make.sh b/Design/Melawy/melawy-icon-theme/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-icon-theme/00_make.sh +++ b/Design/Melawy/melawy-icon-theme/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh b/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh +++ b/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Melawy/melawy-purple-dark-cursors/00_make.sh b/Design/Melawy/melawy-purple-dark-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-purple-dark-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-dark-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh b/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-purple-light-cursors/00_make.sh b/Design/Melawy/melawy-purple-light-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-purple-light-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-light-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh b/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-red-dark-cursors/00_make.sh b/Design/Melawy/melawy-red-dark-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-red-dark-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-dark-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh b/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-red-light-cursors/00_make.sh b/Design/Melawy/melawy-red-light-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-red-light-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-light-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Melawy/melawy-red-light-default-cursors/00_make.sh b/Design/Melawy/melawy-red-light-default-cursors/00_make.sh index 5b1364e..912c96f 100755 --- a/Design/Melawy/melawy-red-light-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-light-default-cursors/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-plasma-look-and-feel-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh b/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD index 5f40d7a..8277f88 100644 --- a/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD +++ b/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh b/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-sddm-theme-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh b/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh +++ b/Design/Nier-A2/melawy-wallpaper-nier-a2/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Design/make.sh b/Design/make.sh index 3b50023..72e760d 100755 --- a/Design/make.sh +++ b/Design/make.sh @@ -58,3 +58,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Installer/make.sh b/Installer/make.sh index a7a627b..608bc65 100755 --- a/Installer/make.sh +++ b/Installer/make.sh @@ -58,3 +58,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Installer/melawy-calamares-config/.gitignore b/Installer/melawy-calamares-config/.gitignore new file mode 100644 index 0000000..b48786f --- /dev/null +++ b/Installer/melawy-calamares-config/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-calamares-qt5 diff --git a/Installer/melawy-calamares-config/00_make.sh b/Installer/melawy-calamares-config/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Installer/melawy-calamares-config/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Installer/melawy-calamares/01_sign.sh b/Installer/melawy-calamares-config/01_sign.sh similarity index 100% rename from Installer/melawy-calamares/01_sign.sh rename to Installer/melawy-calamares-config/01_sign.sh diff --git a/Installer/melawy-calamares-config/PKGBUILD b/Installer/melawy-calamares-config/PKGBUILD new file mode 100644 index 0000000..96b8743 --- /dev/null +++ b/Installer/melawy-calamares-config/PKGBUILD @@ -0,0 +1,59 @@ +# Maintainer : Valeria Fadeeva +# Calamares installer (fork from EndeavourOS) configured for Melawy Linux + +_gitname="melawy-calamares-qt5" +pkgname="$(basename $(pwd))" +release_name=$pkgname +pkgver=3.3.0.11056 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=('any') +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=('LGPL') +provides=('calamares-config') +conflicts=('calamares-config' 'calamares-configs') +options=('!strip' '!emptydirs') +sha256sums=('SKIP') +source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") + +depends=() + +makedepends=('git') + +pkgver() { + cd "${srcdir}/${_gitname}" + printf "3.3.0.%s" "$(git rev-list --count HEAD)" +} + +prepare() { + # Update branding.desc with the proper values + replace_command=' + { + gsub(/\${version}/,version); + gsub(/\${release_name}/,release); + print + } + ' + awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/src/branding/melawy/branding.desc" +} + + +package() { + install -dm 755 "${pkgdir}/etc/calamares" + + install -dm 755 "${pkgdir}/etc/calamares/branding" + cp -rf ${srcdir}/$_gitname/src/branding/melawy "$pkgdir/etc/calamares/branding" + + cp -f ${srcdir}/$_gitname/settings_offline.conf "$pkgdir/etc/calamares/settings_offline.conf" + cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings_online.conf" + cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings.conf" + + cp -rf ${srcdir}/$_gitname/src/scripts "$pkgdir/etc/calamares" + cp -rf ${srcdir}/$_gitname/src/images "$pkgdir/etc/calamares" + cp -rf ${srcdir}/$_gitname/src/files "$pkgdir/etc/calamares" + + install -dm 755 "${pkgdir}/etc/calamares/modules" + cp -rf ${srcdir}/$_gitname/src/modules/*/*.conf "$pkgdir/etc/calamares/modules" + + cp -f "${srcdir}/$_gitname/src/modules/netinstall/netinstall.yaml" "$pkgdir/etc/calamares/modules/netinstall.yaml" +} diff --git a/Installer/melawy-calamares_new/README.md b/Installer/melawy-calamares-config/README.md similarity index 78% rename from Installer/melawy-calamares_new/README.md rename to Installer/melawy-calamares-config/README.md index b3f029e..ef11674 100644 --- a/Installer/melawy-calamares_new/README.md +++ b/Installer/melawy-calamares-config/README.md @@ -1,5 +1,5 @@ # calamares -Calamares installer for Melawy Linux - Development version +Calamares installer configs for Melawy Linux - Development version ### Donate [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) diff --git a/Installer/melawy-calamares-qt5/.gitignore b/Installer/melawy-calamares-qt5/.gitignore new file mode 100644 index 0000000..b48786f --- /dev/null +++ b/Installer/melawy-calamares-qt5/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-calamares-qt5 diff --git a/Core/melawy-hooks/00_make.sh b/Installer/melawy-calamares-qt5/00_make.sh similarity index 98% rename from Core/melawy-hooks/00_make.sh rename to Installer/melawy-calamares-qt5/00_make.sh index 6cafb4e..c7436db 100755 --- a/Core/melawy-hooks/00_make.sh +++ b/Installer/melawy-calamares-qt5/00_make.sh @@ -23,3 +23,5 @@ do done notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Installer/melawy-calamares_new/01_sign.sh b/Installer/melawy-calamares-qt5/01_sign.sh similarity index 100% rename from Installer/melawy-calamares_new/01_sign.sh rename to Installer/melawy-calamares-qt5/01_sign.sh diff --git a/Installer/melawy-calamares/PKGBUILD b/Installer/melawy-calamares-qt5/PKGBUILD similarity index 57% rename from Installer/melawy-calamares/PKGBUILD rename to Installer/melawy-calamares-qt5/PKGBUILD index 08eb784..826a934 100644 --- a/Installer/melawy-calamares/PKGBUILD +++ b/Installer/melawy-calamares-qt5/PKGBUILD @@ -4,25 +4,75 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.11005 +pkgver=3.3.0.11057 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') url="https://git.melawy.ru/Melawy-Linux/$_gitname" - -license=('GPL3') - -makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk' 'ninja' 'qt5-tools' 'kdbusaddons') - -depends=( 'qt5-svg' 'qt5-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons' 'kconfig' 'ki18n' 'kservice' 'kwidgetsaddons' 'kpmcore' 'squashfs-tools' 'rsync' 'cryptsetup' 'qt5-xmlpatterns' 'doxygen' 'dmidecode' 'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt5' 'python' 'solid' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'kdbusaddons') - +license=('LGPL') provides=("calamares") conflicts=('calamares') - -options=(!strip !emptydirs) +options=('!strip' '!emptydirs' 'debug' 'staticlibs') +sha256sums=('SKIP') source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") -sha256sums=('SKIP') +depends=( +'boost-libs' +'ckbcomp' +'cryptsetup' +'dmidecode' +'doxygen' +'gptfdisk' +'hwinfo' +'kconfig5' +'kcoreaddons5' +'kdbusaddons5' +'ki18n5' +'kpackage5' +'kparts5' +'kpmcore' +'kservice5' +'kwidgetsaddons5' +'libatasmart' +'libpwquality' +'networkmanager' +'parted' +'plasma-framework5' +'polkit-qt5' +'python' +'qt5-declarative' +'qt5-location' +'qt5-quickcontrols' +'qt5-quickcontrols2' +'qt5-svg' +'qt5-tools' +'qt5-virtualkeyboard' +'qt5-webengine' +'qt5-xmlpatterns' +'rsync' +'solid5' +'squashfs-tools' +'udisks2' +'upower' +'yaml-cpp' +'melawy-calamares-config' +) + +makedepends=( +'boost' +'clang' +'cmake' +'extra-cmake-modules' +'gawk' +'git' +'kdbusaddons5' +'kpmcore' +'ninja' +'python-jsonschema' +'python-pyaml' +'python-unidecode' +'qt5-tools' +) pkgver() { cd "${srcdir}/${_gitname}" @@ -49,13 +99,11 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DWITH_APPSTREAM=OFF \ - -DINSTALL_CONFIG=OFF \ - -DSKIP_MODULES="dracut \ - dummycpp dummyprocess dummypython dummypythonqt \ - finishedq initcpio keyboardq license localeq notesqml oemid \ - openrcdmcryptcfg plymouthcfg plasmalnf services-openrc \ - summaryq tracking usersq webview welcomeq" + -DSKIP_MODULES="dracut dracutlukscfg \ + dummycpp dummyprocess dummypython dummypythonqt \ + finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ + openrcdmcryptcfg plasmalnf services-openrc \ + summaryq tracking usersq webview welcomeq" export DESTDIR="$srcdir/build" cmake --build build --parallel $_cpuCount @@ -64,15 +112,9 @@ build() { package() { DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install - install -dm 755 "${pkgdir}/etc" - cp -rp "${srcdir}/$_gitname/data/melawy" "${pkgdir}/etc/calamares" - install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" -# install -dm 755 "${pkgdir}/etc/xdg/autostart" -# install -Dm644 "${srcdir}/$_gitname/calamares.desktop" "${pkgdir}/etc/xdg/autostart/calamares.desktop" - install -dm 755 "${pkgdir}/usr/bin" install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" } diff --git a/Installer/melawy-calamares_new/PKGBUILD b/Installer/melawy-calamares-qt5/PKGBUILD_with_configs similarity index 77% rename from Installer/melawy-calamares_new/PKGBUILD rename to Installer/melawy-calamares-qt5/PKGBUILD_with_configs index 757f337..202c68f 100644 --- a/Installer/melawy-calamares_new/PKGBUILD +++ b/Installer/melawy-calamares-qt5/PKGBUILD_with_configs @@ -1,28 +1,77 @@ # Maintainer : Valeria Fadeeva # Calamares installer (fork from EndeavourOS) configured for Melawy Linux -_gitname="melawy-calamares" +_gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.11015 +pkgver=3.3.0.11031 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') url="https://git.melawy.ru/Melawy-Linux/$_gitname" - -license=('GPL3') - -makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk' 'ninja' 'qt5-tools' 'kdbusaddons5') - -depends=( 'qt5-svg' 'qt5-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons5' 'kconfig5' 'ki18n5' 'kservice5' 'kwidgetsaddons5' 'kpmcore' 'squashfs-tools' 'rsync' 'cryptsetup' 'qt5-xmlpatterns' 'doxygen' 'dmidecode' 'gptfdisk' 'hwinfo' 'kparts5' 'polkit-qt5' 'python' 'solid5' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'kdbusaddons5') - +license=('LGPL') provides=("calamares") conflicts=('calamares') - -options=(!strip !emptydirs) +options=('!strip' '!emptydirs' 'debug' '!staticlibs') +sha256sums=('SKIP') source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") -sha256sums=('SKIP') +depends=( +'boost-libs' +'ckbcomp' +'cryptsetup' +'dmidecode' +'doxygen' +'gptfdisk' +'hwinfo' +'kconfig5' +'kcoreaddons5' +'kdbusaddons5' +'ki18n5' +'kpackage5' +'kparts5' +'kpmcore' +'kservice5' +'kwidgetsaddons5' +'libatasmart' +'libpwquality' +'networkmanager' +'parted' +'plasma-framework5' +'polkit-qt5' +'python' +'qt5-declarative' +'qt5-location' +'qt5-quickcontrols' +'qt5-quickcontrols2' +'qt5-svg' +'qt5-tools' +'qt5-virtualkeyboard' +'qt5-webengine' +'qt5-xmlpatterns' +'rsync' +'solid5' +'squashfs-tools' +'udisks2' +'upower' +'yaml-cpp' +) + +makedepends=( +'boost' +'clang' +'cmake' +'extra-cmake-modules' +'gawk' +'git' +'kdbusaddons5' +'kpmcore' +'ninja' +'python-jsonschema' +'python-pyaml' +'python-unidecode' +'qt5-tools' +) pkgver() { cd "${srcdir}/${_gitname}" @@ -49,7 +98,6 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DINSTALL_CONFIG=OFF \ -DSKIP_MODULES="dracut dracutlukscfg \ dummycpp dummyprocess dummypython dummypythonqt \ finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ diff --git a/Installer/melawy-calamares/README.md b/Installer/melawy-calamares-qt5/README.md similarity index 100% rename from Installer/melawy-calamares/README.md rename to Installer/melawy-calamares-qt5/README.md diff --git a/Installer/melawy-calamares_new/лишнее.txt b/Installer/melawy-calamares-qt5/лишнее.txt similarity index 100% rename from Installer/melawy-calamares_new/лишнее.txt rename to Installer/melawy-calamares-qt5/лишнее.txt diff --git a/Installer/melawy-calamares-qt6/.gitignore b/Installer/melawy-calamares-qt6/.gitignore index 0ee13a0..603a633 100644 --- a/Installer/melawy-calamares-qt6/.gitignore +++ b/Installer/melawy-calamares-qt6/.gitignore @@ -1,4 +1,4 @@ *.tar.* pkg/ src/ -/melawy-calamares +/melawy-calamares-qt6 diff --git a/Installer/melawy-calamares-qt6/00_make.sh b/Installer/melawy-calamares-qt6/00_make.sh index 5b1364e..c7436db 100755 --- a/Installer/melawy-calamares-qt6/00_make.sh +++ b/Installer/melawy-calamares-qt6/00_make.sh @@ -22,5 +22,6 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Installer/melawy-calamares-qt6/01_sign.sh b/Installer/melawy-calamares-qt6/01_sign.sh index 77055f1..2ce514d 100755 --- a/Installer/melawy-calamares-qt6/01_sign.sh +++ b/Installer/melawy-calamares-qt6/01_sign.sh @@ -19,3 +19,5 @@ do gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" fi done + +echo "Ready" diff --git a/Installer/melawy-calamares-qt6/PKGBUILD b/Installer/melawy-calamares-qt6/PKGBUILD index 9f80da2..18cc0ab 100644 --- a/Installer/melawy-calamares-qt6/PKGBUILD +++ b/Installer/melawy-calamares-qt6/PKGBUILD @@ -4,7 +4,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.11011 +pkgver=3.3.0.10921 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') @@ -12,13 +12,67 @@ url="https://git.melawy.ru/Melawy-Linux/$_gitname" license=('LGPL') provides=("calamares") conflicts=('calamares') -options=('!strip' '!emptydirs' 'debug' '!staticlibs') +options=('!strip' '!emptydirs' 'debug' 'staticlibs') sha256sums=('SKIP') source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") -depends=(qt6-svg qt6-location qt6-5compat kconfig ki18n kcoreaddons solid kpackage plasma-framework yaml-cpp parted libatasmart udisks2 polkit-qt6 kpmcore kparts kdbusaddons libpwquality qt6-virtualkeyboard zfs-utils zfs-dkms qt6-webengine networkmanager upower kservice kwidgetsaddons squashfs-tools rsync cryptsetup qt5-xmlpatterns doxygen dmidecode gptfdisk hwinfo python boost-libs ckbcomp qt6-declarative) +depends=( +'boost-libs' +'ckbcomp' +'cryptsetup' +'dmidecode' +'doxygen' +'gptfdisk' +'hwinfo' +'kconfig5' +'kcoreaddons5' +'kdbusaddons5' +'ki18n5' +'kpackage5' +'kparts5' +'kpmcore' +'kservice5' +'kwidgetsaddons5' +'libatasmart' +'libpwquality' +'networkmanager' +'parted' +'plasma-framework5' +'polkit-qt5' +'python' +'qt5-declarative' +'qt5-location' +'qt5-quickcontrols' +'qt5-quickcontrols2' +'qt5-svg' +'qt5-tools' +'qt5-virtualkeyboard' +'qt5-webengine' +'qt5-xmlpatterns' +'rsync' +'solid5' +'squashfs-tools' +'udisks2' +'upower' +'yaml-cpp' +'melawy-calamares-config' +) -makedepends=(extra-cmake-modules git qt6-tools boost cmake kpmcore python-jsonschema python-pyaml python-unidecode gawk ninja kdbusaddons) # clang) +makedepends=( +'boost' +'clang' +'cmake' +'extra-cmake-modules' +'gawk' +'git' +'kdbusaddons5' +'kpmcore' +'ninja' +'python-jsonschema' +'python-pyaml' +'python-unidecode' +'qt5-tools' +) pkgver() { cd "${srcdir}/${_gitname}" @@ -45,9 +99,11 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=lib \ - -DINSTALL_CONFIG=OFF \ - -DWITH_QT6=ON \ - -DSKIP_MODULES="bootldr bootloader license notesqml oemid preservefiles partitionq" + -DSKIP_MODULES="dracut dracutlukscfg \ + dummycpp dummyprocess dummypython dummypythonqt \ + finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ + openrcdmcryptcfg plasmalnf services-openrc \ + summaryq tracking usersq webview welcomeq" export DESTDIR="$srcdir/build" cmake --build build --parallel $_cpuCount @@ -56,20 +112,6 @@ build() { package() { DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install - install -dm 755 "${pkgdir}/etc/calamares" - cp -f ${srcdir}/$_gitname/settings_offline.conf "$pkgdir/etc/calamares/settings_offline.conf" - cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings_online.conf" - cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings.conf" - - cp -rf ${srcdir}/$_gitname/src/scripts "$pkgdir/etc/calamares" - cp -rf ${srcdir}/$_gitname/src/images "$pkgdir/etc/calamares" - cp -rf ${srcdir}/$_gitname/src/files "$pkgdir/etc/calamares" - - install -dm 755 "${pkgdir}/etc/calamares/modules" - cp -rf ${srcdir}/$_gitname/src/modules/*/*.conf "$pkgdir/etc/calamares/modules" - - cp -f "${srcdir}/$_gitname/src/modules/netinstall/netinstall.yaml" "$pkgdir/etc/calamares/modules/netinstall.yaml" - install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" diff --git a/Installer/melawy-calamares-qt6/PKGBUILD_6 b/Installer/melawy-calamares-qt6/PKGBUILD_6 new file mode 100644 index 0000000..a0b69b9 --- /dev/null +++ b/Installer/melawy-calamares-qt6/PKGBUILD_6 @@ -0,0 +1,119 @@ +# Maintainer : Valeria Fadeeva +# Calamares installer QT6 KF6 configured for Melawy Linux + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +release_name=$pkgname +pkgver=3.3.0.11011 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=('any') +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=('LGPL') +provides=("calamares") +conflicts=('calamares') +options=('!strip' '!emptydirs' 'debug' 'staticlibs') +sha256sums=('SKIP') +source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") + +depends=( +'boost-libs' +'ckbcomp' +'cryptsetup' +'dmidecode' +'doxygen' +'gptfdisk' +'hwinfo' +'kconfig' +'kcoreaddons' +'kdbusaddons' +'ki18n' +'kpackage' +'kparts' +'kpmcore' +'kservice' +'kwidgetsaddons' +'libatasmart' +'libpwquality' +'networkmanager' +'parted' +'plasma-framework' +'polkit-qt6' +'python' +'qt6-5compat' +'qt6-declarative' +'qt6-location' +'qt6-svg' +'qt6-tools' +'qt6-virtualkeyboard' +'qt6-webengine' +'qt5-xmlpatterns' +'rsync' +'solid' +'squashfs-tools' +'udisks2' +'upower' +'yaml-cpp' +'melawy-calamares-config' +) + +makedepends=( +'boost' +'clang' +'cmake' +'extra-cmake-modules' +'gawk' +'git' +'kdbusaddons' +'kpmcore' +'ninja' +'python-jsonschema' +'python-pyaml' +'python-unidecode' +'qt6-tools' +) + +pkgver() { + cd "${srcdir}/${_gitname}" + printf "3.3.0.%s" "$(git rev-list --count HEAD)" +} + +prepare() { + # Update branding.desc with the proper values + replace_command=' + { + gsub(/\${version}/,version); + gsub(/\${release_name}/,release); + print + } + ' + awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/src/branding/melawy/branding.desc" +} + +build() { + _cpuCount=$(grep -c -w ^processor /proc/cpuinfo) + + cmake -B build -S "${srcdir}/$_gitname" \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DSKIP_MODULES="dracut dracutlukscfg \ + dummycpp dummyprocess dummypython dummypythonqt \ + finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ + openrcdmcryptcfg plasmalnf services-openrc \ + summaryq tracking usersq webview welcomeq" + + export DESTDIR="$srcdir/build" + cmake --build build --parallel $_cpuCount +} + +package() { + DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install + + install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" + install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" + + install -dm 755 "${pkgdir}/usr/bin" + install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" +} diff --git a/Installer/melawy-calamares-qt6/PKGBUILD_with_configs b/Installer/melawy-calamares-qt6/PKGBUILD_with_configs new file mode 100644 index 0000000..2a2217f --- /dev/null +++ b/Installer/melawy-calamares-qt6/PKGBUILD_with_configs @@ -0,0 +1,130 @@ +# Maintainer : Valeria Fadeeva +# Calamares installer QT6 KF6 configured for Melawy Linux + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +release_name=$pkgname +pkgver=3.3.0.10917 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=('any') +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=('LGPL') +provides=("calamares") +conflicts=('calamares') +options=('!strip' '!emptydirs' 'debug' 'staticlibs') +sha256sums=('SKIP') +source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") + +depends=( +'boost-libs' +'ckbcomp' +'cryptsetup' +'dmidecode' +'doxygen' +'gptfdisk' +'hwinfo' +'kconfig5' +'kcoreaddons5' +'kdbusaddons5' +'ki18n5' +'kpackage5' +'kparts5' +'kpmcore' +'kservice5' +'kwidgetsaddons5' +'libatasmart' +'libpwquality' +'networkmanager' +'parted' +'plasma-framework5' +'polkit-qt5' +'python' +'qt5-declarative' +'qt5-location' +'qt5-quickcontrols' +'qt5-quickcontrols2' +'qt5-svg' +'qt5-tools' +'qt5-virtualkeyboard' +'qt5-webengine' +'qt5-xmlpatterns' +'rsync' +'solid5' +'squashfs-tools' +'udisks2' +'upower' +'yaml-cpp' +'melawy-calamares-config' +) + +makedepends=( +'boost' +'clang' +'cmake' +'extra-cmake-modules' +'gawk' +'git' +'kdbusaddons5' +'kpmcore' +'ninja' +'python-jsonschema' +'python-pyaml' +'python-unidecode' +'qt5-tools' +) + +pkgver() { + cd "${srcdir}/${_gitname}" + printf "3.3.0.%s" "$(git rev-list --count HEAD)" +} + +prepare() { + # Update branding.desc with the proper values + replace_command=' + { + gsub(/\${version}/,version); + gsub(/\${release_name}/,release); + print + } + ' + awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/src/branding/melawy/branding.desc" +} + +build() { + _cpuCount=$(grep -c -w ^processor /proc/cpuinfo) + + cmake -B build -S "${srcdir}/$_gitname" \ + -GNinja \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=lib \ + -DSKIP_MODULES="bootldr bootloader license notesqml oemid preservefiles partitionq" + + export DESTDIR="$srcdir/build" + cmake --build build --parallel $_cpuCount +} + +package() { + DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install + + install -dm 755 "${pkgdir}/etc/calamares" + cp -f ${srcdir}/$_gitname/settings_offline.conf "$pkgdir/etc/calamares/settings_offline.conf" + cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings_online.conf" + cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings.conf" + + cp -rf ${srcdir}/$_gitname/src/scripts "$pkgdir/etc/calamares" + cp -rf ${srcdir}/$_gitname/src/images "$pkgdir/etc/calamares" + cp -rf ${srcdir}/$_gitname/src/files "$pkgdir/etc/calamares" + + install -dm 755 "${pkgdir}/etc/calamares/modules" + cp -rf ${srcdir}/$_gitname/src/modules/*/*.conf "$pkgdir/etc/calamares/modules" + + cp -f "${srcdir}/$_gitname/src/modules/netinstall/netinstall.yaml" "$pkgdir/etc/calamares/modules/netinstall.yaml" + + install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" + install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" + + install -dm 755 "${pkgdir}/usr/bin" + install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" +} diff --git a/Installer/melawy-calamares_new/.gitignore b/Installer/melawy-calamares_new/.gitignore deleted file mode 100644 index 0ee13a0..0000000 --- a/Installer/melawy-calamares_new/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tar.* -pkg/ -src/ -/melawy-calamares diff --git a/Installer/melawy-calamares_new/00_make.sh b/Installer/melawy-calamares_new/00_make.sh deleted file mode 100755 index 5b1364e..0000000 --- a/Installer/melawy-calamares_new/00_make.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash - -makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - -for i in *.pkg.tar.zst; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -for i in *.pkg.tar.xz; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" diff --git a/Installer/melawy-welcome/00_make.sh b/Installer/melawy-welcome/00_make.sh index 5b1364e..912c96f 100755 --- a/Installer/melawy-welcome/00_make.sh +++ b/Installer/melawy-welcome/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Installer/melawy-welcome/PKGBUILD b/Installer/melawy-welcome/PKGBUILD index 87f0927..a8c3ebc 100644 --- a/Installer/melawy-welcome/PKGBUILD +++ b/Installer/melawy-welcome/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=0.10.1.200 +pkgver=0.10.1.204 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('x86_64') diff --git a/Menu/make.sh b/Menu/make.sh index a7a627b..608bc65 100755 --- a/Menu/make.sh +++ b/Menu/make.sh @@ -58,3 +58,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh b/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh +++ b/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh b/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh +++ b/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh b/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh index 6cafb4e..122f2f7 100755 --- a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh +++ b/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/Never/freeoffice b/Never/freeoffice new file mode 160000 index 0000000..2857282 --- /dev/null +++ b/Never/freeoffice @@ -0,0 +1 @@ +Subproject commit 2857282acad9b729ac4cb73195d9d81ae8e0c9c1 diff --git a/Never/make.sh b/Never/make.sh new file mode 100755 index 0000000..cd79738 --- /dev/null +++ b/Never/make.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +find . -type f -name "*.xz" -delete +find . -type f -name "*.zst" -delete +find . -type f -name "*.sig" -delete + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) +do + cd $CWD/$package_dir + git pull + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.zst; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.xz.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then + + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.zst.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then + + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + cd $CWD +done + +echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s +notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/3party/paru-bin/.SRCINFO b/Never/paru-bin/.SRCINFO similarity index 100% rename from 3party/paru-bin/.SRCINFO rename to Never/paru-bin/.SRCINFO diff --git a/3party/paru-bin/.gitignore b/Never/paru-bin/.gitignore similarity index 100% rename from 3party/paru-bin/.gitignore rename to Never/paru-bin/.gitignore diff --git a/Installer/melawy-calamares/00_make.sh b/Never/paru-bin/00_make.sh similarity index 98% rename from Installer/melawy-calamares/00_make.sh rename to Never/paru-bin/00_make.sh index 5b1364e..912c96f 100755 --- a/Installer/melawy-calamares/00_make.sh +++ b/Never/paru-bin/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Never/paru-bin/01_sign.sh b/Never/paru-bin/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Never/paru-bin/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/3party/paru-bin/PKGBUILD b/Never/paru-bin/PKGBUILD similarity index 100% rename from 3party/paru-bin/PKGBUILD rename to Never/paru-bin/PKGBUILD diff --git a/3party/paru-git/.SRCINFO b/Never/paru-git/.SRCINFO similarity index 100% rename from 3party/paru-git/.SRCINFO rename to Never/paru-git/.SRCINFO diff --git a/3party/paru-git/.gitignore b/Never/paru-git/.gitignore similarity index 100% rename from 3party/paru-git/.gitignore rename to Never/paru-git/.gitignore diff --git a/3party/paru-bin/00_make.sh b/Never/paru-git/00_make.sh similarity index 98% rename from 3party/paru-bin/00_make.sh rename to Never/paru-git/00_make.sh index 5b1364e..912c96f 100755 --- a/3party/paru-bin/00_make.sh +++ b/Never/paru-git/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Never/paru-git/01_sign.sh b/Never/paru-git/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Never/paru-git/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/3party/paru-git/PKGBUILD b/Never/paru-git/PKGBUILD similarity index 100% rename from 3party/paru-git/PKGBUILD rename to Never/paru-git/PKGBUILD diff --git a/3party/paru/.SRCINFO b/Never/paru/.SRCINFO similarity index 100% rename from 3party/paru/.SRCINFO rename to Never/paru/.SRCINFO diff --git a/3party/paru/.gitignore b/Never/paru/.gitignore similarity index 100% rename from 3party/paru/.gitignore rename to Never/paru/.gitignore diff --git a/3party/paru-git/00_make.sh b/Never/paru/00_make.sh similarity index 98% rename from 3party/paru-git/00_make.sh rename to Never/paru/00_make.sh index 5b1364e..912c96f 100755 --- a/3party/paru-git/00_make.sh +++ b/Never/paru/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Never/paru/01_sign.sh b/Never/paru/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Never/paru/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/3party/paru/PKGBUILD b/Never/paru/PKGBUILD similarity index 100% rename from 3party/paru/PKGBUILD rename to Never/paru/PKGBUILD diff --git a/One_per_month/linux-xanmod-anbox b/One_per_month/linux-xanmod-anbox new file mode 160000 index 0000000..032b0a6 --- /dev/null +++ b/One_per_month/linux-xanmod-anbox @@ -0,0 +1 @@ +Subproject commit 032b0a6c56a7ba91525b2ab9845f48c0c22b1144 diff --git a/One_per_month/make.sh b/One_per_month/make.sh new file mode 100755 index 0000000..433ea6a --- /dev/null +++ b/One_per_month/make.sh @@ -0,0 +1,67 @@ +#!/bin/bash + +find . -type f -name "*.xz" -delete +find . -type f -name "*.zst" -delete +find . -type f -name "*.sig" -delete + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) +do + cd $CWD/$package_dir + + bash 00_git_pull.sh + bash 01_patch.sh + bash 02_make.sh + + for i in *.pkg.tar.zst; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst" | head -n 1) + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/*.pkg.tar.zst $REPO/ + fi + + package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz" | head -n 1) + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/*.pkg.tar.xz $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.xz.sig" | head -n 1) + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/*.pkg.tar.xz.sig $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.zst.sig" | head -n 1) + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/*.pkg.tar.zst.sig $REPO/ + fi + + cd $CWD +done + +echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s +notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/One_per_month/pwd.txt b/One_per_month/pwd.txt new file mode 100644 index 0000000..cfa941e --- /dev/null +++ b/One_per_month/pwd.txt @@ -0,0 +1 @@ +/data/github/active/Melawy/PKGBUILD-git.melawy.ru/One_per_month \ No newline at end of file diff --git a/Updater/make.sh b/Updater/make.sh index a7a627b..608bc65 100755 --- a/Updater/make.sh +++ b/Updater/make.sh @@ -58,3 +58,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Updater/melawy-arch-linux-updater/00_make.sh b/Updater/melawy-arch-linux-updater/00_make.sh index 5b1364e..912c96f 100755 --- a/Updater/melawy-arch-linux-updater/00_make.sh +++ b/Updater/melawy-arch-linux-updater/00_make.sh @@ -24,3 +24,5 @@ done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Updater/melawy-arch-linux-updater/PKGBUILD b/Updater/melawy-arch-linux-updater/PKGBUILD index 0ce9119..b849c43 100644 --- a/Updater/melawy-arch-linux-updater/PKGBUILD +++ b/Updater/melawy-arch-linux-updater/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.14 +pkgver=1.15 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh b/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh index c40ba7d..122f2f7 100755 --- a/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh +++ b/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh @@ -22,4 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')" +echo "Ready" diff --git a/push.sh b/push.sh index 5840a9b..ebfdf06 100755 --- a/push.sh +++ b/push.sh @@ -2,5 +2,6 @@ git add . && git commit -m "Update" && git push -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s notify-send -a "$(basename $(pwd)): Push" -t 999999999 "Update finished" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready"