Update

Core/dracut-initramfs/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.13
+pkgver=1.14
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"
@@ -29,8 +29,10 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/$_gitname/10-dracut-initramfs-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-initramfs-pre-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/10-dracut-initramfs-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-initramfs-pre-install.hook"
-  install -Dm644 "${srcdir}/$_gitname/60-dracut-initramfs-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-initramfs-remove.hook"
+#   install -Dm644 "${srcdir}/$_gitname/60-dracut-initramfs-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-initramfs-remove.hook"
-  install -Dm644 "${srcdir}/$_gitname/90-dracut-initramfs-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-initramfs-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/90-dracut-initramfs-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-initramfs-install.hook"
-  install -Dm755 "${srcdir}/$_gitname/dracut-initramfs"                     "${pkgdir}/usr/bin/dracut-initramfs"
+#   install -Dm755 "${srcdir}/$_gitname/dracut-initramfs"                     "${pkgdir}/usr/bin/dracut-initramfs"
+
+  cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/"
 }

Core/dracut-ukify/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.14
+pkgver=1.15
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"
@@ -29,8 +29,10 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/$_gitname/10-dracut-ukify-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-ukify-pre-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/10-dracut-ukify-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-dracut-ukify-pre-install.hook"
-  install -Dm644 "${srcdir}/$_gitname/60-dracut-ukify-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-ukify-remove.hook"
+#   install -Dm644 "${srcdir}/$_gitname/60-dracut-ukify-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-dracut-ukify-remove.hook"
-  install -Dm644 "${srcdir}/$_gitname/90-dracut-ukify-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-ukify-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/90-dracut-ukify-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-dracut-ukify-install.hook"
-  install -Dm755 "${srcdir}/$_gitname/dracut-ukify"                     "${pkgdir}/usr/bin/dracut-ukify"
+#   install -Dm755 "${srcdir}/$_gitname/dracut-ukify"                     "${pkgdir}/usr/bin/dracut-ukify"
+
+  cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/"
 }

Core/etc-skel-std-powerman/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.6
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')

Core/etc-skel-std-powerman/etc-skel-std-powerman/FETCH_HEAD

@@ -0,0 +1 @@
+56517b422b93cbeb64eb7bf63741255366bf8d96	not-for-merge	branch 'main' of https://git.melawy.ru/Melawy-Linux/etc-skel-std-powerman

Core/etc-skel-std-powerman/etc-skel-std-powerman/refs/heads/main

@@ -0,0 +1 @@
+56517b422b93cbeb64eb7bf63741255366bf8d96

Core/etc-skel/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.7
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')

Core/melawy-hooks/.gitignore

@@ -0,0 +1,4 @@
+*.tar.*
+pkg/
+src/
+/melawy-hooks

Core/melawy-hooks/00_make.sh

@@ -0,0 +1,27 @@
+#!/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 "Make finished" "$(date '+%Y.%m.%d %H:%M:%S')"

Core/melawy-hooks/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

Core/melawy-hooks/PKGBUILD

@@ -0,0 +1,33 @@
+# Maintainer: Valeria Fadeeva <valeria@fadeeva.me>
+
+_gitname="$(basename $(pwd))"
+pkgname=("$_gitname")
+pkgver=1.1
+pkgrel=1
+pkgdesc="$(head -n 2 README.md | tail -n 1)"
+url="https://git.melawy.ru/Melawy-Linux/$_gitname"
+arch=("any")
+license=("AGPL3")
+depends=()
+optdepends=()
+makedepends=("git")
+backup=()
+provides=("${pkgname}")
+conflicts=("${pkgname}")
+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)"
+}
+
+package() {
+  cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/"
+}

Core/melawy-hooks/README.md

@@ -0,0 +1,11 @@
+# melawy-hooks
+lsb-release, os-release
+
+### Donate
+[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066)
+
+[YooMoney](https://yoomoney.ru/to/4100115921160758)
+
+[Qiwi](https://qiwi.com/n/VALERIAFADEEVA)
+
+Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f

Core/refind-menu-generator/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.15
+pkgver=1.18
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"
@@ -29,13 +29,17 @@ pkgver() {
 }
 
 package() {
-  install -Dm644 "${srcdir}/$_gitname/10-refind-menu-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-refind-menu-pre-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/10-refind-menu-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-refind-menu-pre-install.hook"
-  install -Dm644 "${srcdir}/$_gitname/60-refind-menu-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-refind-menu-remove.hook"
+#   install -Dm644 "${srcdir}/$_gitname/60-refind-menu-remove.hook"      "${pkgdir}/usr/share/libalpm/hooks/60-refind-menu-remove.hook"
-  install -Dm644 "${srcdir}/$_gitname/90-refind-menu-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-refind-menu-install.hook"
+#   install -Dm644 "${srcdir}/$_gitname/90-refind-menu-install.hook"     "${pkgdir}/usr/share/libalpm/hooks/90-refind-menu-install.hook"
-  install -dm755 "${pkgdir}/etc/refind-menu-generator"
+#   install -dm755 "${pkgdir}/etc/refind-menu-generator"
-  install -Dm644 "${srcdir}/$_gitname/menu-end.txt"                    "${pkgdir}/etc/refind-menu-generator/menu-end.txt"
+#   install -Dm644 "${srcdir}/$_gitname/refind.conf"                    "${pkgdir}/etc/refind-menu-generator/refind.conf"
-  install -Dm644 "${srcdir}/$_gitname/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template.txt"
+#   install -Dm644 "${srcdir}/$_gitname/menu-end.txt"                    "${pkgdir}/etc/refind-menu-generator/menu-end.txt"
-  install -Dm644 "${srcdir}/$_gitname/menu-template-efi-first.txt"     "${pkgdir}/etc/refind-menu-generator/menu-template-efi-first.txt"
+#   install -Dm644 "${srcdir}/$_gitname/menu-template.txt"               "${pkgdir}/etc/refind-menu-generator/menu-template.txt"
-  install -Dm644 "${srcdir}/$_gitname/menu-template-vmlinuz-first.txt" "${pkgdir}/etc/refind-menu-generator/menu-template-vmlinuz-first.txt"
+#   install -Dm644 "${srcdir}/$_gitname/menu-template-efi-first.txt"     "${pkgdir}/etc/refind-menu-generator/menu-template-efi-first.txt"
-  install -Dm755 "${srcdir}/$_gitname/refind-menu-generator"           "${pkgdir}/usr/bin/refind-menu-generator"
+#   install -Dm644 "${srcdir}/$_gitname/menu-template-vmlinuz-first.txt" "${pkgdir}/etc/refind-menu-generator/menu-template-vmlinuz-first.txt"
+#   install -Dm755 "${srcdir}/$_gitname/refind-menu-generator"           "${pkgdir}/usr/bin/refind-menu-generator"
+
+  cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/etc" "$pkgdir/"
+  cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/"
 }

Core/skel-liveuser/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.15
+pkgver=1.1
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')

Design/Fenek/plymouth-theme-fenek/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.12
+pkgver=1.13
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"

Design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.14
+pkgver=1.15
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"

Design/Nier-A2/plymouth-theme-nier-a2/PKGBUILD

@@ -2,7 +2,7 @@
 
 _gitname="$(basename $(pwd))"
 pkgname=("melawy-$_gitname")
-pkgver=1.6
+pkgver=1.7
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 url="https://git.melawy.ru/Melawy-Linux/$_gitname"

Installer/melawy-calamares/PKGBUILD

@@ -4,7 +4,7 @@
 _gitname="$(basename $(pwd))"
 pkgname=("$_gitname")
 release_name=$pkgname
-pkgver=3.3.0.10983
+pkgver=3.3.0.10996
 pkgrel=1
 pkgdesc="$(head -n 2 README.md | tail -n 1)"
 arch=('any')