diff --git a/Core/dracut-initramfs/01_sign.sh b/Core/dracut-initramfs/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/dracut-initramfs/01_sign.sh +++ b/Core/dracut-initramfs/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/dracut-initramfs/PKGBUILD b/Core/dracut-initramfs/PKGBUILD index 67e1b63..d6ad9a4 100644 --- a/Core/dracut-initramfs/PKGBUILD +++ b/Core/dracut-initramfs/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Core/dracut-ukify/01_sign.sh b/Core/dracut-ukify/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/dracut-ukify/01_sign.sh +++ b/Core/dracut-ukify/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/dracut-ukify/PKGBUILD b/Core/dracut-ukify/PKGBUILD index 50acf49..4d9e582 100644 --- a/Core/dracut-ukify/PKGBUILD +++ b/Core/dracut-ukify/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Core/etc-skel/01_sign.sh b/Core/etc-skel/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/etc-skel/01_sign.sh +++ b/Core/etc-skel/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/etc-skel/PKGBUILD b/Core/etc-skel/PKGBUILD index 0e94491..e3732ae 100644 --- a/Core/etc-skel/PKGBUILD +++ b/Core/etc-skel/PKGBUILD @@ -21,7 +21,7 @@ conflicts=("${pkgname}") options=(!strip !emptydirs) source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=("95F48000540A4DB146583A47C49B5E77FD80302D") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Core/linux-keyring/01_sign.sh b/Core/linux-keyring/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/linux-keyring/01_sign.sh +++ b/Core/linux-keyring/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/linux-keyring/PKGBUILD b/Core/linux-keyring/PKGBUILD index a09391f..8ce57f4 100644 --- a/Core/linux-keyring/PKGBUILD +++ b/Core/linux-keyring/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.1 +pkgver=1.2 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Core/linux-mirrorlist/01_sign.sh b/Core/linux-mirrorlist/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/linux-mirrorlist/01_sign.sh +++ b/Core/linux-mirrorlist/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/linux-mirrorlist/PKGBUILD b/Core/linux-mirrorlist/PKGBUILD index b45eb4f..1dda8ca 100644 --- a/Core/linux-mirrorlist/PKGBUILD +++ b/Core/linux-mirrorlist/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Core/refind-menu-generator/01_sign.sh b/Core/refind-menu-generator/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Core/refind-menu-generator/01_sign.sh +++ b/Core/refind-menu-generator/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Core/refind-menu-generator/PKGBUILD b/Core/refind-menu-generator/PKGBUILD index bcd49ca..e0ad2d1 100644 --- a/Core/refind-menu-generator/PKGBUILD +++ b/Core/refind-menu-generator/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.10 +pkgver=1.11 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" @@ -35,6 +35,7 @@ package() { 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/menu-template.txt" "${pkgdir}/etc/refind-menu-generator/menu-template.txt" - install -Dm644 "${srcdir}/$_gitname/menu-template.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 -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" } diff --git a/Design/Fenek/plasma-look-and-feel-fenek/01_sign.sh b/Design/Fenek/plasma-look-and-feel-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/plasma-look-and-feel-fenek/01_sign.sh +++ b/Design/Fenek/plasma-look-and-feel-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/plasma-look-and-feel-fenek/PKGBUILD b/Design/Fenek/plasma-look-and-feel-fenek/PKGBUILD index 7fa5835..4a1109d 100644 --- a/Design/Fenek/plasma-look-and-feel-fenek/PKGBUILD +++ b/Design/Fenek/plasma-look-and-feel-fenek/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.Melawy.Fenek.desktop" THEME_PATH="/usr/share/plasma/look-and-feel" diff --git a/Design/Fenek/plymouth-theme-fenek/01_sign.sh b/Design/Fenek/plymouth-theme-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/plymouth-theme-fenek/01_sign.sh +++ b/Design/Fenek/plymouth-theme-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/plymouth-theme-fenek/PKGBUILD b/Design/Fenek/plymouth-theme-fenek/PKGBUILD index d06f6fd..376f987 100644 --- a/Design/Fenek/plymouth-theme-fenek/PKGBUILD +++ b/Design/Fenek/plymouth-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.8 +pkgver=1.10 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="melawy-fenek" THEME_PATH="/usr/share/plymouth/themes" diff --git a/Design/Fenek/plymouth-theme-hard-install-fenek/01_sign.sh b/Design/Fenek/plymouth-theme-hard-install-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/plymouth-theme-hard-install-fenek/01_sign.sh +++ b/Design/Fenek/plymouth-theme-hard-install-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/refind-theme-fenek/01_sign.sh b/Design/Fenek/refind-theme-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/refind-theme-fenek/01_sign.sh +++ b/Design/Fenek/refind-theme-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/refind-theme-fenek/PKGBUILD b/Design/Fenek/refind-theme-fenek/PKGBUILD index fc703ce..0de9930 100644 --- a/Design/Fenek/refind-theme-fenek/PKGBUILD +++ b/Design/Fenek/refind-theme-fenek/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="melawy-fenek" THEME_PATH="/usr/share/refind/themes" diff --git a/Design/Fenek/sddm-theme-fenek/01_sign.sh b/Design/Fenek/sddm-theme-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/sddm-theme-fenek/01_sign.sh +++ b/Design/Fenek/sddm-theme-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/sddm-theme-fenek/PKGBUILD b/Design/Fenek/sddm-theme-fenek/PKGBUILD index 79d04d7..7a6a74a 100644 --- a/Design/Fenek/sddm-theme-fenek/PKGBUILD +++ b/Design/Fenek/sddm-theme-fenek/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy-Fenek" THEME_PATH="/usr/share/sddm/themes" diff --git a/Design/Fenek/wallpaper-fenek/01_sign.sh b/Design/Fenek/wallpaper-fenek/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Fenek/wallpaper-fenek/01_sign.sh +++ b/Design/Fenek/wallpaper-fenek/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Fenek/wallpaper-fenek/PKGBUILD b/Design/Fenek/wallpaper-fenek/PKGBUILD index 231eb31..6efa59b 100644 --- a/Design/Fenek/wallpaper-fenek/PKGBUILD +++ b/Design/Fenek/wallpaper-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.1 +pkgver=1.3 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy Fenek" THEME_PATH="/usr/share/wallpapers" diff --git a/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/01_sign.sh b/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/PKGBUILD b/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/PKGBUILD index bb4407b..40bb3fa 100644 --- a/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/plasma-look-and-feel-lera-sugar/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.Melawy.Lera-Sugar.desktop" THEME_PATH="/usr/share/plasma/look-and-feel" diff --git a/Design/Lera-Sugar/plymouth-theme-hard-install-lera-sugar/01_sign.sh b/Design/Lera-Sugar/plymouth-theme-hard-install-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/plymouth-theme-hard-install-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/plymouth-theme-hard-install-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/plymouth-theme-lera-sugar/01_sign.sh b/Design/Lera-Sugar/plymouth-theme-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/plymouth-theme-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/plymouth-theme-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD index 7e3bbcb..33d1e5e 100644 --- a/Design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/plymouth-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.10 +pkgver=1.12 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="melawy-lera-sugar" THEME_PATH="/usr/share/plymouth/themes" diff --git a/Design/Lera-Sugar/refind-theme-lera-sugar/01_sign.sh b/Design/Lera-Sugar/refind-theme-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/refind-theme-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/refind-theme-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD index 9d265ea..10210c9 100644 --- a/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="melawy-lera-sugar" THEME_PATH="/usr/share/refind/themes" diff --git a/Design/Lera-Sugar/sddm-theme-lera-sugar/01_sign.sh b/Design/Lera-Sugar/sddm-theme-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/sddm-theme-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/sddm-theme-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/sddm-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/sddm-theme-lera-sugar/PKGBUILD index 3263d62..67655b6 100644 --- a/Design/Lera-Sugar/sddm-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/sddm-theme-lera-sugar/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy-Lera-Sugar" THEME_PATH="/usr/share/sddm/themes" diff --git a/Design/Lera-Sugar/wallpaper-lera-sugar/01_sign.sh b/Design/Lera-Sugar/wallpaper-lera-sugar/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Lera-Sugar/wallpaper-lera-sugar/01_sign.sh +++ b/Design/Lera-Sugar/wallpaper-lera-sugar/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Lera-Sugar/wallpaper-lera-sugar/PKGBUILD b/Design/Lera-Sugar/wallpaper-lera-sugar/PKGBUILD index d023386..37a9883 100644 --- a/Design/Lera-Sugar/wallpaper-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/wallpaper-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.5 +pkgver=1.7 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy Lera Sugar" THEME_PATH="/usr/share/wallpapers" diff --git a/Design/Melawy/color-scheme-konsole/01_sign.sh b/Design/Melawy/color-scheme-konsole/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/color-scheme-konsole/01_sign.sh +++ b/Design/Melawy/color-scheme-konsole/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/color-scheme-konsole/PKGBUILD b/Design/Melawy/color-scheme-konsole/PKGBUILD index 07248b7..780bb9c 100644 --- a/Design/Melawy/color-scheme-konsole/PKGBUILD +++ b/Design/Melawy/color-scheme-konsole/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy" THEME_PATH="/usr/share/konsole" diff --git a/Design/Melawy/color-scheme/01_sign.sh b/Design/Melawy/color-scheme/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/color-scheme/01_sign.sh +++ b/Design/Melawy/color-scheme/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/color-scheme/PKGBUILD b/Design/Melawy/color-scheme/PKGBUILD index 8564f2f..b35c46a 100644 --- a/Design/Melawy/color-scheme/PKGBUILD +++ b/Design/Melawy/color-scheme/PKGBUILD @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy.colors" THEME_PATH="/usr/share/color-schemes" diff --git a/Design/Melawy/icon-theme/01_sign.sh b/Design/Melawy/icon-theme/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/icon-theme/01_sign.sh +++ b/Design/Melawy/icon-theme/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/icon-theme/PKGBUILD b/Design/Melawy/icon-theme/PKGBUILD index ce5eaa6..fdbaedc 100644 --- a/Design/Melawy/icon-theme/PKGBUILD +++ b/Design/Melawy/icon-theme/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/icon-theme_local/01_sign.sh b/Design/Melawy/icon-theme_local/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/icon-theme_local/01_sign.sh +++ b/Design/Melawy/icon-theme_local/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/plasma-desktop-theme/01_sign.sh b/Design/Melawy/plasma-desktop-theme/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/plasma-desktop-theme/01_sign.sh +++ b/Design/Melawy/plasma-desktop-theme/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/plasma-desktop-theme/PKGBUILD b/Design/Melawy/plasma-desktop-theme/PKGBUILD index 8465f79..7526040 100644 --- a/Design/Melawy/plasma-desktop-theme/PKGBUILD +++ b/Design/Melawy/plasma-desktop-theme/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="Melawy" THEME_PATH1="/usr/share/plasma/desktoptheme" diff --git a/Design/Melawy/purple-dark-cursors/01_sign.sh b/Design/Melawy/purple-dark-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/purple-dark-cursors/01_sign.sh +++ b/Design/Melawy/purple-dark-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/purple-dark-cursors/PKGBUILD b/Design/Melawy/purple-dark-cursors/PKGBUILD index 7e29d59..46b4693 100644 --- a/Design/Melawy/purple-dark-cursors/PKGBUILD +++ b/Design/Melawy/purple-dark-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/purple-dark-default-cursors/01_sign.sh b/Design/Melawy/purple-dark-default-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/purple-dark-default-cursors/01_sign.sh +++ b/Design/Melawy/purple-dark-default-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/purple-dark-default-cursors/PKGBUILD b/Design/Melawy/purple-dark-default-cursors/PKGBUILD index 447acc0..aaa4bfa 100644 --- a/Design/Melawy/purple-dark-default-cursors/PKGBUILD +++ b/Design/Melawy/purple-dark-default-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/purple-light-cursors/01_sign.sh b/Design/Melawy/purple-light-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/purple-light-cursors/01_sign.sh +++ b/Design/Melawy/purple-light-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/purple-light-cursors/PKGBUILD b/Design/Melawy/purple-light-cursors/PKGBUILD index 7e29d59..46b4693 100644 --- a/Design/Melawy/purple-light-cursors/PKGBUILD +++ b/Design/Melawy/purple-light-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/purple-light-default-cursors/01_sign.sh b/Design/Melawy/purple-light-default-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/purple-light-default-cursors/01_sign.sh +++ b/Design/Melawy/purple-light-default-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/purple-light-default-cursors/PKGBUILD b/Design/Melawy/purple-light-default-cursors/PKGBUILD index 447acc0..aaa4bfa 100644 --- a/Design/Melawy/purple-light-default-cursors/PKGBUILD +++ b/Design/Melawy/purple-light-default-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/red-dark-cursors/01_sign.sh b/Design/Melawy/red-dark-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/red-dark-cursors/01_sign.sh +++ b/Design/Melawy/red-dark-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/red-dark-cursors/PKGBUILD b/Design/Melawy/red-dark-cursors/PKGBUILD index 7e29d59..46b4693 100644 --- a/Design/Melawy/red-dark-cursors/PKGBUILD +++ b/Design/Melawy/red-dark-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/red-dark-default-cursors/01_sign.sh b/Design/Melawy/red-dark-default-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/red-dark-default-cursors/01_sign.sh +++ b/Design/Melawy/red-dark-default-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/red-dark-default-cursors/PKGBUILD b/Design/Melawy/red-dark-default-cursors/PKGBUILD index 447acc0..aaa4bfa 100644 --- a/Design/Melawy/red-dark-default-cursors/PKGBUILD +++ b/Design/Melawy/red-dark-default-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/red-light-cursors/01_sign.sh b/Design/Melawy/red-light-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/red-light-cursors/01_sign.sh +++ b/Design/Melawy/red-light-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/red-light-cursors/PKGBUILD b/Design/Melawy/red-light-cursors/PKGBUILD index 7e29d59..46b4693 100644 --- a/Design/Melawy/red-light-cursors/PKGBUILD +++ b/Design/Melawy/red-light-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Melawy/red-light-default-cursors/01_sign.sh b/Design/Melawy/red-light-default-cursors/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Melawy/red-light-default-cursors/01_sign.sh +++ b/Design/Melawy/red-light-default-cursors/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Melawy/red-light-default-cursors/PKGBUILD b/Design/Melawy/red-light-default-cursors/PKGBUILD index 447acc0..aaa4bfa 100644 --- a/Design/Melawy/red-light-default-cursors/PKGBUILD +++ b/Design/Melawy/red-light-default-cursors/PKGBUILD @@ -17,7 +17,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/Melawy-icon-theme" diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/FETCH_HEAD b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/FETCH_HEAD deleted file mode 100644 index dba2f65..0000000 --- a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -5706c81a59a752b2f3548b14a07935df7958fb9a not-for-merge branch 'main' of https://github.com/Melawy/plasma-plasmoid-DittoMenu diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/06/201682d4dc36ca551c02f8fed50d4ef0932d41 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/06/201682d4dc36ca551c02f8fed50d4ef0932d41 deleted file mode 100644 index babf207..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/06/201682d4dc36ca551c02f8fed50d4ef0932d41 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/07/195cc1d2cb0b272916d548da46b0692b5b91c2 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/07/195cc1d2cb0b272916d548da46b0692b5b91c2 deleted file mode 100644 index e6608fe..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/07/195cc1d2cb0b272916d548da46b0692b5b91c2 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/08/92a45947babf2c66fb540c32e3a24a4f3458de b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/08/92a45947babf2c66fb540c32e3a24a4f3458de deleted file mode 100644 index 723975e..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/08/92a45947babf2c66fb540c32e3a24a4f3458de and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/09/a009f893251af0d178f1de90cbdd74db2ec463 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/09/a009f893251af0d178f1de90cbdd74db2ec463 deleted file mode 100644 index ca2d80d..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/09/a009f893251af0d178f1de90cbdd74db2ec463 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/10/44c8620e63f89475b91005eb16326843d66e46 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/10/44c8620e63f89475b91005eb16326843d66e46 deleted file mode 100644 index 9ce23db..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/10/44c8620e63f89475b91005eb16326843d66e46 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/19/7d7de56d1ffeef4dd4dcd6ceae848a35f6cbbe b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/19/7d7de56d1ffeef4dd4dcd6ceae848a35f6cbbe deleted file mode 100644 index 0096982..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/19/7d7de56d1ffeef4dd4dcd6ceae848a35f6cbbe and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/20/eb7030e29f0eca78231e07e8b755096ad57a89 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/20/eb7030e29f0eca78231e07e8b755096ad57a89 deleted file mode 100644 index e14abd1..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/20/eb7030e29f0eca78231e07e8b755096ad57a89 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/21/6c1319ed98ad236ab6eb7afac9cca1a8edb9c4 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/21/6c1319ed98ad236ab6eb7afac9cca1a8edb9c4 deleted file mode 100644 index 9d7b56b..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/21/6c1319ed98ad236ab6eb7afac9cca1a8edb9c4 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/2c/5a1bf7be5e99af636c78ded9de97cb530e4e83 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/2c/5a1bf7be5e99af636c78ded9de97cb530e4e83 deleted file mode 100644 index 7aee412..0000000 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/2c/5a1bf7be5e99af636c78ded9de97cb530e4e83 and /dev/null differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/34/07f0a1fd019de302dbbd25a8e9686497d85b02 b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/34/07f0a1fd019de302dbbd25a8e9686497d85b02 deleted file mode 100644 index 5e5b7c8..0000000 --- a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/34/07f0a1fd019de302dbbd25a8e9686497d85b02 +++ /dev/null @@ -1,4 +0,0 @@ -xu=oEp c HYclX>gfvggٹ3NDDAI@E@2=~;~ 6o{ X^!pep|ϑ9W_o/[`!O <'og߁!>:l <^_3Ik:A0!PJ$bJ700 ڇt=-幈)LhğTj #kKv)m>׫f\xKDfhnD?TD3i91nC42± 9YƳ-ZU),i;\ϔxU* }̆"čŎM*;Soœ9\)\*{#{D;Ó\i\Eeeº$eY q ]xȈbkߌTY$H+F=GY)A u>.sEM2ؘFޏ˸*u≮i]:;KK7ZNSEksLŨq{Nݸ-K 4'C,o a[H->IOdрe:&ۛgtFc:#_XKeV{ҡV] bF&2yLˉ;QdCo\FhúD -jY.Pz*u4Ėl|ɂAXD:L -/]؁VRQ2Ee5 kbKI ãjB|uuihq$S댫df4L_ tIY4T* -¥ Ezkvh}χzea L]: \N.τDwՁ!rxJG>$ Y𜠛T~fE:!, \ No newline at end of file diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/35/fac1824f53fb81eaf8efe8552221556086e11e b/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/35/fac1824f53fb81eaf8efe8552221556086e11e deleted file mode 100644 index 93f9f78..0000000 --- a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/35/fac1824f53fb81eaf8efe8552221556086e11e +++ /dev/null @@ -1,2 +0,0 @@ -xA -0a9EB4I"'T -!z/-LMOhi8.$= h3 |r5?"F,1%x1]A񷽗Nb?D۝ݙ쬗DBH4@/@7)%JEA5ٱiĦC?fgx/cy-̯ƹ=} -z-1=8t 8}9wc <2 dy΂|?σ7Or V'rs 9%p d8:r߂\*x/dgau47k ||d9& &\x0Q80֌Ƀ?k˺@3s{k1Y'1YoA9J'R紞JM*4¾1)L{VgoL3ɮc7ӎ 7^U܊N,)pѼV̮cE浥vNAIʼnWo)RZiP8et\ZZ{RX4܇[WqB_ҡt\ŻYv#VfʣۤF~L"r܏%Zӳ"9/EE8@2ў5Z]͓K&hc%;HrbܿHMޚ"n'bBP !:wCH~tF0Cqt{kbB&td(UY 8Gq̉BI&)P8N It`~ȇXipwP GZjpR|hKo_PB41E + +_gitname="$(basename $(pwd))" +pkgname=("melawy-$_gitname") +pkgver=3.3.0.8 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=("i686" "x86_64") +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +license=("AGPL") + +depends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + +makedepends=('appstream-qt' 'boost' 'boost-libs' 'ckbcomp' 'cmake' 'cryptsetup' 'dmidecode' 'doxygen' 'efibootmgr' 'extra-cmake-modules' 'git' 'gptfdisk' 'gtk-update-icon-cache' 'hwinfo' 'icu' 'kconfig' 'kcoreaddons' 'kdbusaddons' 'ki18n' 'kiconthemes' 'kio' 'kparts' 'kpmcore' 'kservice' 'kwidgetsaddons' 'libpwquality' 'mkinitcpio-openswap' 'networkmanager' 'plasma-framework' 'polkit-qt5' 'python' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-tools' 'qt5-translations' 'qt5-webengine' 'qt5-xmlpatterns' 'rsync' 'solid' 'squashfs-tools' 'upower' 'yaml-cpp') + +optdepends=() + +backup=() +provides=("${pkgname}") +conflicts=("calamares" "${pkgname}") +options=(!strip !emptydirs) +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 "3.3.0.%s" "$(git rev-list --count HEAD)" +} + +prepare() { +# cp -rv ../modules/* ${srcdir}/$_pkgname-${pkgver}/src/modules/ + + sed -i -e 's/"Install configuration files" OFF/"Install configuration files" ON/' "${srcdir}/${_gitname}/calamares/CMakeLists.txt" + sed -i -e 's/# DEBUG_FILESYSTEMS/DEBUG_FILESYSTEMS/' "${srcdir}/${_gitname}/calamares/CMakeLists.txt" + sed -i -e "s/desired_size = 512 \* 1024 \* 1024 \# 512MiB/desired_size = 512 \* 1024 \* 1024 \* 4 \# 2048MiB/" "${srcdir}/${_gitname}/calamares/src/modules/fstab/main.py" + sed -i -e "s|CALAMARES_VERSION 3.3.0-alpha3|CALAMARES_VERSION $pkgver|g" "${srcdir}/${_gitname}/calamares/CMakeLists.txt" +} + +build() { + rm -rf "${_gitname}/build/*" + + mkdir -p "${_gitname}/build" + + cmake -B "${_gitname}/build" -S "${_gitname}/calamares" \ + -DWEBVIEW_FORCE_WEBKIT=OFF \ + -DWITH_PYTHONQT=ON \ + -DWITH_KF5DBus=ON \ + -DWITH_APPSTREAM=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib \ + -DSKIP_MODULES="dummyprocess dummypython dummycpp dummypythonqt" + +# -DBoost_NO_BOOST_CMAKE=ON \ + + export DESTDIR="${_gitname}/build" + make -j $(nproc) -C "${_gitname}/build" +} + +package() { + make -C "${srcdir}/${_gitname}/build" DESTDIR="${pkgdir}" install + install -Dm644 "${srcdir}/${_gitname}/calamares/melawy-linux.desktop" "${pkgdir}/usr/share/applications/melawy-linux.desktop" + install -Dm644 "${srcdir}/${_gitname}/calamares/melawy-linux-debugging.desktop" "${pkgdir}/usr/share/applications/melawy-linux-debugging.desktop" + install -Dm755 "${srcdir}/${_gitname}/calamares/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" +# rm "${pkgdir}/usr/share/applications/calamares.desktop" +# install -dm 755 "${pkgdir}/etc" +# cp -rp "${srcdir}/${_gitname}/calamares/configs" "${pkgdir}/etc/calamares" +# cp -rp "${srcdir}/${_gitname}/calamares/configs/melawy-linux" "${pkgdir}/etc/calamares" +} diff --git a/Installer/calamares_local/01_sign.sh b/Installer/calamares_local/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Installer/calamares_local/01_sign.sh +++ b/Installer/calamares_local/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Installer/calamares_local/PKGBUILD b/Installer/calamares_local/PKGBUILD index 46fbf48..fc4f81a 100644 --- a/Installer/calamares_local/PKGBUILD +++ b/Installer/calamares_local/PKGBUILD @@ -21,7 +21,7 @@ conflicts=("calamares" "${pkgname}") options=(!strip !emptydirs) source=("file:///disk/github/active/Melawy/Melawy-Dev/CORE/calamares_local/calamares.tar.gz") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "${srcdir}/$_gitname" diff --git a/Installer/calamares_test/01_sign.sh b/Installer/calamares_test/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Installer/calamares_test/01_sign.sh +++ b/Installer/calamares_test/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Installer/calamares_test/PKGBUILD b/Installer/calamares_test/PKGBUILD index 9b26ab0..637f712 100644 --- a/Installer/calamares_test/PKGBUILD +++ b/Installer/calamares_test/PKGBUILD @@ -21,7 +21,7 @@ conflicts=("calamares" "${pkgname}") options=(!strip !emptydirs) source=("file:///disk/github/active/Melawy/Melawy-Dev/CORE/calamares_test/calamares.tar.gz") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "${srcdir}/$_gitname" diff --git a/Installer/skel-liveuser/01_sign.sh b/Installer/skel-liveuser/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Installer/skel-liveuser/01_sign.sh +++ b/Installer/skel-liveuser/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Installer/skel-liveuser/PKGBUILD b/Installer/skel-liveuser/PKGBUILD index 1cf095d..0746bc3 100644 --- a/Installer/skel-liveuser/PKGBUILD +++ b/Installer/skel-liveuser/PKGBUILD @@ -21,7 +21,7 @@ conflicts=("${pkgname}") options=() source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=("95F48000540A4DB146583A47C49B5E77FD80302D") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Installer/skel-liveuser_local/01_sign.sh b/Installer/skel-liveuser_local/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Installer/skel-liveuser_local/01_sign.sh +++ b/Installer/skel-liveuser_local/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/.gitignore b/Menu/plasma-plasmoid-DittoMenu/.gitignore similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/.gitignore rename to Menu/plasma-plasmoid-DittoMenu/.gitignore diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/00_make.sh b/Menu/plasma-plasmoid-DittoMenu/00_make.sh similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/00_make.sh rename to Menu/plasma-plasmoid-DittoMenu/00_make.sh diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/01_sign.sh b/Menu/plasma-plasmoid-DittoMenu/01_sign.sh similarity index 60% rename from Design/Menu/plasma-plasmoid-DittoMenu/01_sign.sh rename to Menu/plasma-plasmoid-DittoMenu/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Menu/plasma-plasmoid-DittoMenu/01_sign.sh +++ b/Menu/plasma-plasmoid-DittoMenu/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/PKGBUILD b/Menu/plasma-plasmoid-DittoMenu/PKGBUILD similarity index 92% rename from Design/Menu/plasma-plasmoid-DittoMenu/PKGBUILD rename to Menu/plasma-plasmoid-DittoMenu/PKGBUILD index 7e20c52..35a9760 100644 --- a/Design/Menu/plasma-plasmoid-DittoMenu/PKGBUILD +++ b/Menu/plasma-plasmoid-DittoMenu/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" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.adhec.DittoMenu" THEME_PATH="/usr/share/plasma/plasmoids" diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/README.md b/Menu/plasma-plasmoid-DittoMenu/README.md similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/README.md rename to Menu/plasma-plasmoid-DittoMenu/README.md diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/HEAD b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/HEAD similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/HEAD rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/HEAD diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config similarity index 63% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config index 4baf68a..1efa4f5 100644 --- a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config +++ b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/config @@ -3,6 +3,6 @@ filemode = true bare = true [remote "origin"] - url = https://github.com/Melawy/plasma-plasmoid-DittoMenu.git + url = https://git.melawy.ru/Melawy-Linux/plasma-plasmoid-DittoMenu.git fetch = +refs/*:refs/* mirror = true diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/description b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/description similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/description rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/description diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/applypatch-msg.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/applypatch-msg.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/applypatch-msg.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/applypatch-msg.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/commit-msg.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/commit-msg.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/commit-msg.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/commit-msg.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/fsmonitor-watchman.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/fsmonitor-watchman.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/fsmonitor-watchman.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/fsmonitor-watchman.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/post-update.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/post-update.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/post-update.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/post-update.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-applypatch.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-applypatch.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-applypatch.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-applypatch.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-commit.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-commit.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-commit.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-commit.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-merge-commit.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-merge-commit.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-merge-commit.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-merge-commit.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-push.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-push.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-push.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-push.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-rebase.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-rebase.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-rebase.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-rebase.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-receive.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-receive.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-receive.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/pre-receive.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/prepare-commit-msg.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/prepare-commit-msg.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/prepare-commit-msg.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/prepare-commit-msg.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/push-to-checkout.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/push-to-checkout.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/push-to-checkout.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/push-to-checkout.sample diff --git a/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/sendemail-validate.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/sendemail-validate.sample new file mode 100755 index 0000000..640bcf8 --- /dev/null +++ b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/sendemail-validate.sample @@ -0,0 +1,77 @@ +#!/bin/sh + +# An example hook script to validate a patch (and/or patch series) before +# sending it via email. +# +# The hook should exit with non-zero status after issuing an appropriate +# message if it wants to prevent the email(s) from being sent. +# +# To enable this hook, rename this file to "sendemail-validate". +# +# By default, it will only check that the patch(es) can be applied on top of +# the default upstream branch without conflicts in a secondary worktree. After +# validation (successful or not) of the last patch of a series, the worktree +# will be deleted. +# +# The following config variables can be set to change the default remote and +# remote ref that are used to apply the patches against: +# +# sendemail.validateRemote (default: origin) +# sendemail.validateRemoteRef (default: HEAD) +# +# Replace the TODO placeholders with appropriate checks according to your +# needs. + +validate_cover_letter () { + file="$1" + # TODO: Replace with appropriate checks (e.g. spell checking). + true +} + +validate_patch () { + file="$1" + # Ensure that the patch applies without conflicts. + git am -3 "$file" || return + # TODO: Replace with appropriate checks for this patch + # (e.g. checkpatch.pl). + true +} + +validate_series () { + # TODO: Replace with appropriate checks for the whole series + # (e.g. quick build, coding style checks, etc.). + true +} + +# main ------------------------------------------------------------------------- + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = 1 +then + remote=$(git config --default origin --get sendemail.validateRemote) && + ref=$(git config --default HEAD --get sendemail.validateRemoteRef) && + worktree=$(mktemp --tmpdir -d sendemail-validate.XXXXXXX) && + git worktree add -fd --checkout "$worktree" "refs/remotes/$remote/$ref" && + git config --replace-all sendemail.validateWorktree "$worktree" +else + worktree=$(git config --get sendemail.validateWorktree) +fi || { + echo "sendemail-validate: error: failed to prepare worktree" >&2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/update.sample b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/update.sample similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/update.sample rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/hooks/update.sample diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/info/exclude b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/info/exclude similarity index 100% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/info/exclude rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/info/exclude diff --git a/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.idx b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.idx new file mode 100644 index 0000000..1eb9355 Binary files /dev/null and b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.idx differ diff --git a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-7145c5a3689aaf81d1f1042c383de2e27bbddcba.pack b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.pack similarity index 74% rename from Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-7145c5a3689aaf81d1f1042c383de2e27bbddcba.pack rename to Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.pack index 0dfda48..70efa61 100644 Binary files a/Design/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-7145c5a3689aaf81d1f1042c383de2e27bbddcba.pack and b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.pack differ diff --git a/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.rev b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.rev new file mode 100644 index 0000000..8f3ee81 Binary files /dev/null and b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/objects/pack/pack-47e4c1903c3e81e362d82478a3f7afeeb21951f3.rev differ diff --git a/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/packed-refs b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/packed-refs new file mode 100644 index 0000000..46f64f0 --- /dev/null +++ b/Menu/plasma-plasmoid-DittoMenu/plasma-plasmoid-DittoMenu/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +58d3148bea436c35852d411f603b177032fa0cfb refs/heads/main diff --git a/Design/Menu/plasma-plasmoid-Menu11/.gitignore b/Menu/plasma-plasmoid-Menu11/.gitignore similarity index 100% rename from Design/Menu/plasma-plasmoid-Menu11/.gitignore rename to Menu/plasma-plasmoid-Menu11/.gitignore diff --git a/Design/Menu/plasma-plasmoid-Menu11/00_make.sh b/Menu/plasma-plasmoid-Menu11/00_make.sh similarity index 100% rename from Design/Menu/plasma-plasmoid-Menu11/00_make.sh rename to Menu/plasma-plasmoid-Menu11/00_make.sh diff --git a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh b/Menu/plasma-plasmoid-Menu11/01_sign.sh similarity index 60% rename from Design/Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh rename to Menu/plasma-plasmoid-Menu11/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh +++ b/Menu/plasma-plasmoid-Menu11/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Menu/plasma-plasmoid-Menu11/PKGBUILD b/Menu/plasma-plasmoid-Menu11/PKGBUILD similarity index 92% rename from Design/Menu/plasma-plasmoid-Menu11/PKGBUILD rename to Menu/plasma-plasmoid-Menu11/PKGBUILD index efd0cfe..b1b3b7b 100644 --- a/Design/Menu/plasma-plasmoid-Menu11/PKGBUILD +++ b/Menu/plasma-plasmoid-Menu11/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_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" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.adhec.Menu11" THEME_PATH="/usr/share/plasma/plasmoids" diff --git a/Design/Menu/plasma-plasmoid-Menu11/README.md b/Menu/plasma-plasmoid-Menu11/README.md similarity index 100% rename from Design/Menu/plasma-plasmoid-Menu11/README.md rename to Menu/plasma-plasmoid-Menu11/README.md diff --git a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/.gitignore b/Menu/plasma-plasmoid-OnzeMenuKDE/.gitignore similarity index 100% rename from Design/Menu/plasma-plasmoid-OnzeMenuKDE/.gitignore rename to Menu/plasma-plasmoid-OnzeMenuKDE/.gitignore diff --git a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/00_make.sh b/Menu/plasma-plasmoid-OnzeMenuKDE/00_make.sh similarity index 100% rename from Design/Menu/plasma-plasmoid-OnzeMenuKDE/00_make.sh rename to Menu/plasma-plasmoid-OnzeMenuKDE/00_make.sh diff --git a/Design/Menu/plasma-plasmoid-Menu11/01_sign.sh b/Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh similarity index 60% rename from Design/Menu/plasma-plasmoid-Menu11/01_sign.sh rename to Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Design/Menu/plasma-plasmoid-Menu11/01_sign.sh +++ b/Menu/plasma-plasmoid-OnzeMenuKDE/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD b/Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD similarity index 92% rename from Design/Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD rename to Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD index 3826281..2f84a8e 100644 --- a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD +++ b/Menu/plasma-plasmoid-OnzeMenuKDE/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_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" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.adhec.OnzeMenuKDE" THEME_PATH="/usr/share/plasma/plasmoids" diff --git a/Design/Menu/plasma-plasmoid-OnzeMenuKDE/README.md b/Menu/plasma-plasmoid-OnzeMenuKDE/README.md similarity index 100% rename from Design/Menu/plasma-plasmoid-OnzeMenuKDE/README.md rename to Menu/plasma-plasmoid-OnzeMenuKDE/README.md diff --git a/Updater/arch-linux-updater/01_sign.sh b/Updater/arch-linux-updater/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Updater/arch-linux-updater/01_sign.sh +++ b/Updater/arch-linux-updater/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Updater/arch-linux-updater/PKGBUILD b/Updater/arch-linux-updater/PKGBUILD index a9a93e4..44faea7 100644 --- a/Updater/arch-linux-updater/PKGBUILD +++ b/Updater/arch-linux-updater/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.5 +pkgver=1.7 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Updater/paru-bin/01_sign.sh b/Updater/paru-bin/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Updater/paru-bin/01_sign.sh +++ b/Updater/paru-bin/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Updater/paru-git/01_sign.sh b/Updater/paru-git/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Updater/paru-git/01_sign.sh +++ b/Updater/paru-git/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Updater/paru/01_sign.sh b/Updater/paru/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Updater/paru/01_sign.sh +++ b/Updater/paru/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Updater/plasma-plasmoid-archupdate/01_sign.sh b/Updater/plasma-plasmoid-archupdate/01_sign.sh index dc5c85d..a0a1700 100755 --- a/Updater/plasma-plasmoid-archupdate/01_sign.sh +++ b/Updater/plasma-plasmoid-archupdate/01_sign.sh @@ -5,7 +5,7 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done for i in *.pkg.tar.xz; @@ -13,5 +13,5 @@ do echo "Удаление подписи $i.sig" rm -f $i.sig echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user 95F48000540A4DB146583A47C49B5E77FD80302D --output "$i.sig" "$i" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" done \ No newline at end of file diff --git a/Updater/plasma-plasmoid-archupdate/PKGBUILD b/Updater/plasma-plasmoid-archupdate/PKGBUILD index 698a981..5e5125a 100644 --- a/Updater/plasma-plasmoid-archupdate/PKGBUILD +++ b/Updater/plasma-plasmoid-archupdate/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.10 +pkgver=1.13 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -16,7 +16,7 @@ provides=("${pkgname}") conflicts=("${pkgname}") source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=('95F48000540A4DB146583A47C49B5E77FD80302D') +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="com.github.Melawy.ArchUpdate" THEME_PATH="/usr/share/plasma/plasmoids"