diff --git a/3party/git_pull.sh b/3party/git_pull.sh new file mode 100755 index 0000000..fd93eca --- /dev/null +++ b/3party/git_pull.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +i=0 +for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) +do + i=$(( $i + 1 )) + echo "$i $CWD/$package_dir" + cd $CWD/$package_dir + git pull + cd $CWD + echo "" +done + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/3party/mailspring b/3party/mailspring index 7ddb8ff..34b32c5 160000 --- a/3party/mailspring +++ b/3party/mailspring @@ -1 +1 @@ -Subproject commit 7ddb8fff4e44dca7605aa8e097b485ba1c2924e6 +Subproject commit 34b32c5a1417beaf2ee8a7a4034e55ba154e88ee diff --git a/3party/make.sh b/3party/make.sh index cd79738..f505b7f 100755 --- a/3party/make.sh +++ b/3party/make.sh @@ -16,52 +16,56 @@ do git pull makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + if [ $? == 0 ]; then + for i in *.pkg.tar.zst; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ fi - 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" + package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ fi - done - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi + package_file=$(ls -1 | grep "pkg.tar.xz.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi + mv -v $CWD/$package_dir/$package_file $REPO/ + fi - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then + package_file=$(ls -1 | grep "pkg.tar.zst.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ + mv -v $CWD/$package_dir/$package_file $REPO/ + fi fi cd $CWD done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') + diff --git a/3party/media-downloader b/3party/media-downloader index f60f713..91134fe 160000 --- a/3party/media-downloader +++ b/3party/media-downloader @@ -1 +1 @@ -Subproject commit f60f713623f2eef26b4b9728e1c25e3ba140b8aa +Subproject commit 91134fe49348e750953669af8440ad25c70d86c6 diff --git a/3party/move_to_repo.sh b/3party/move_to_repo.sh new file mode 100755 index 0000000..39a3a88 --- /dev/null +++ b/3party/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +find . -mindepth 1 -maxdepth 2 -type f -name "*.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 2 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 2 -type f -name "*.xz" -delete +find . -mindepth 1 -maxdepth 2 -type f -name "*.zst" -delete +find . -mindepth 1 -maxdepth 2 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/3party/portainer-bin b/3party/portainer-bin index 3064f8e..38c29aa 160000 --- a/3party/portainer-bin +++ b/3party/portainer-bin @@ -1 +1 @@ -Subproject commit 3064f8e3f2e27aef895e39abbf5f6069ba80b836 +Subproject commit 38c29aaaf85cecdcfd222f2cea8345435371db51 diff --git a/3party/rate-mirrors b/3party/rate-mirrors index 8eadde5..2cbca61 160000 --- a/3party/rate-mirrors +++ b/3party/rate-mirrors @@ -1 +1 @@ -Subproject commit 8eadde526582e6d939722a5c7e85bc5fef1d3c78 +Subproject commit 2cbca613c35e896c3ffa1532fe11e42d1c9e786b diff --git a/3party/appimagelauncher b/Bad/appimagelauncher similarity index 100% rename from 3party/appimagelauncher rename to Bad/appimagelauncher diff --git a/3party/codelldb b/Bad/codelldb similarity index 100% rename from 3party/codelldb rename to Bad/codelldb diff --git a/Bad/get_process.sh b/Bad/get_process.sh new file mode 100755 index 0000000..97b1d1c --- /dev/null +++ b/Bad/get_process.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Bad/git_pull.sh b/Bad/git_pull.sh new file mode 100755 index 0000000..fd93eca --- /dev/null +++ b/Bad/git_pull.sh @@ -0,0 +1,20 @@ +#!/bin/bash + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +i=0 +for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) +do + i=$(( $i + 1 )) + echo "$i $CWD/$package_dir" + cd $CWD/$package_dir + git pull + cd $CWD + echo "" +done + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Bad/libpamac-full b/Bad/libpamac-full new file mode 160000 index 0000000..6f1b560 --- /dev/null +++ b/Bad/libpamac-full @@ -0,0 +1 @@ +Subproject commit 6f1b560153ded64309be412f1e0a3fe47c92b91e diff --git a/Bad/make.sh b/Bad/make.sh new file mode 100755 index 0000000..89ab201 --- /dev/null +++ b/Bad/make.sh @@ -0,0 +1,71 @@ +#!/bin/bash + +find . -type f -name "*.xz" -delete +find . -type f -name "*.zst" -delete +find . -type f -name "*.sig" -delete + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) +do + cd $CWD/$package_dir + git pull + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + if [ $? == 0 ]; then + for i in *.pkg.tar.zst; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + + package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") + if [ -f "$CWD/$package_dir/$package_file" ]; then + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.xz.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then + + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + + package_file=$(ls -1 | grep "pkg.tar.zst.sig") + if [ -f "$CWD/$package_dir/$package_file" ]; then + + mv -v $CWD/$package_dir/$package_file $REPO/ + fi + fi + + cd $CWD +done + +echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/3party/ocs-url b/Bad/ocs-url similarity index 100% rename from 3party/ocs-url rename to Bad/ocs-url diff --git a/Bad/pamac-all b/Bad/pamac-all new file mode 160000 index 0000000..91e059b --- /dev/null +++ b/Bad/pamac-all @@ -0,0 +1 @@ +Subproject commit 91e059b3b07798431c798fb6dfc4411204cd0562 diff --git a/Bad/pamac-cli b/Bad/pamac-cli new file mode 160000 index 0000000..6aafe7c --- /dev/null +++ b/Bad/pamac-cli @@ -0,0 +1 @@ +Subproject commit 6aafe7cf1988f4debeeae19b38cf8bb6162ee88b diff --git a/Core/make.sh b/Core/make.sh index 608bc65..f18c58b 100755 --- a/Core/make.sh +++ b/Core/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Core/melawy-etc-skel-kvantum/PKGBUILD b/Core/melawy-etc-skel-kvantum/PKGBUILD index e8cc6e3..ae7e506 100644 --- a/Core/melawy-etc-skel-kvantum/PKGBUILD +++ b/Core/melawy-etc-skel-kvantum/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.5 +pkgver=1.15 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD b/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD index d3935c8..ae7e506 100644 --- a/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD +++ b/Core/melawy-etc-skel-std-powerman-kvantum/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.6 +pkgver=1.15 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Core/melawy-linux-mirrorlist/PKGBUILD b/Core/melawy-linux-mirrorlist/PKGBUILD index ccbd8a5..af5495c 100644 --- a/Core/melawy-linux-mirrorlist/PKGBUILD +++ b/Core/melawy-linux-mirrorlist/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Core/melawy-skel-liveuser/PKGBUILD b/Core/melawy-skel-liveuser/PKGBUILD index 13c5ef0..def2ef7 100644 --- a/Core/melawy-skel-liveuser/PKGBUILD +++ b/Core/melawy-skel-liveuser/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.8 +pkgver=1.21 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Core/melawy-skel-root/PKGBUILD b/Core/melawy-skel-root/PKGBUILD index f9647fb..54c53c5 100644 --- a/Core/melawy-skel-root/PKGBUILD +++ b/Core/melawy-skel-root/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.8 +pkgver=1.21 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Core/performance-tweaks/00_make.sh b/Core/performance-tweaks/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Core/performance-tweaks/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Core/performance-tweaks/01_sign.sh b/Core/performance-tweaks/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Core/performance-tweaks/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Core/performance-tweaks/PKGBUILD b/Core/performance-tweaks/PKGBUILD new file mode 100644 index 0000000..07d4fb8 --- /dev/null +++ b/Core/performance-tweaks/PKGBUILD @@ -0,0 +1,26 @@ +# Maintainer: dr460nf1r3 +# Contributor: Librewish + +pkgname=performance-tweaks +pkgdesc='Tweaks to improve performance' +pkgver=2.1.2 +pkgrel=1 +arch=('any') +url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" +license=('GPL') +depends=('ananicy-cpp' + 'cachyos-ananicy-rules-git' + 'hdparm' + 'irqbalance' + 'preload') +makedepends=('coreutils') +source=("$pkgname-$pkgver.tar.gz::$url/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('2453da2dd2ea4b921f4d8ebe692ca2d098b67a575aa2ef08480d55d3c184bb75') +conflicts=('powersave-tweaks' 'tlp' 'auto-cpufreq' 'thermald') +install=$pkgname.install + +package() { + install -d "$pkgdir"/usr/lib + cp -rf "$srcdir"/$pkgname-$pkgver/usr "$pkgdir" +} + diff --git a/Core/performance-tweaks/performance-tweaks.install b/Core/performance-tweaks/performance-tweaks.install new file mode 100644 index 0000000..e22d256 --- /dev/null +++ b/Core/performance-tweaks/performance-tweaks.install @@ -0,0 +1,10 @@ +post_install() { + systemctl enable ananicy-cpp + systemctl enable irqbalance + systemctl enable preload +} + +post_upgrade() { + post_install +} + diff --git a/Core/plymouth b/Core/plymouth index 401a266..4f20c50 160000 --- a/Core/plymouth +++ b/Core/plymouth @@ -1 +1 @@ -Subproject commit 401a266ebf8b170cc02c26a55447800295760ea2 +Subproject commit 4f20c501a8e8f94d0016fa990d677dd414ed23df diff --git a/Core/plymouth-git b/Core/plymouth-git deleted file mode 160000 index 4f20c50..0000000 --- a/Core/plymouth-git +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 4f20c501a8e8f94d0016fa990d677dd414ed23df diff --git a/Core/powersave-tweaks/00_make.sh b/Core/powersave-tweaks/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Core/powersave-tweaks/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Core/powersave-tweaks/01_sign.sh b/Core/powersave-tweaks/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Core/powersave-tweaks/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Core/powersave-tweaks/PKGBUILD b/Core/powersave-tweaks/PKGBUILD new file mode 100644 index 0000000..b493c1b --- /dev/null +++ b/Core/powersave-tweaks/PKGBUILD @@ -0,0 +1,20 @@ +# Maintainer: dr460nf1r3 +# Contributor: Librewish + +pkgname=powersave-tweaks +pkgdesc='Tweaks to preserve power on Garuda Linux' +pkgver=2.0.0 +pkgrel=1 +arch=('any') +url="https://gitlab.com/garuda-linux/themes-and-settings/settings/$pkgname" +license=('GPL') +makedepends=('coreutils') +source=("$pkgname-$pkgver.tar.gz::$url/-/archive/$pkgver/$pkgname-$pkgver.tar.gz") +sha256sums=('SKIP') +depends=('hdparm') +conflicts=('performanace-tweaks') + +package() { + install -d "$pkgdir/usr/lib" + cp -rf "$srcdir/$pkgname-$pkgver/usr" "$pkgdir" +} diff --git a/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD b/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD index b9f7d4d..a36be5f 100644 --- a/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD +++ b/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" arch=("any") license=("AGPL3") -depends=() +depends=("melawy-theme") optdepends=() makedepends=("git") backup=() diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD b/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD index e47494e..8156fea 100644 --- a/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD +++ b/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.14 +pkgver=1.18 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -35,3 +35,5 @@ package() { install -d "$pkgdir$THEME_PATH" cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/" } + +install=ins.install diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/ins.install b/Design/Fenek/melawy-plymouth-theme-fenek/ins.install new file mode 100644 index 0000000..cbc2b6a --- /dev/null +++ b/Design/Fenek/melawy-plymouth-theme-fenek/ins.install @@ -0,0 +1,9 @@ +post_install() { + if [ "$(grep 'Theme' /etc/plymouth/plymouthd.conf | cut -d'=' -f2)" == "melawy-fenek" ]; then + plymouth-set-default-theme -R + fi +} + +post_upgrade() { + post_install +} diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD index 2f0179f..ad5cfe2 100644 --- a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD +++ b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD @@ -1,19 +1,16 @@ # Maintainer: Valeria Fadeeva -pkgname='melawy-plymouth-theme-hard-install-fenek' +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") pkgver=1.0 pkgrel=1 -pkgdesc='Liveuser specific plymouth theme hard install Fenek for Melawy Linux' -arch=('any') -url='https://git.melawy.ru/Design' -license=('AGPL3') +pkgdesc="Liveuser specific plymouth theme hard install Fenek for Melawy Linux" +arch=("any") +url="https://git.melawy.ru/Design" +license=("AGPL3") source=() -depends=('melawy-plymouth-theme-fenek') -conflict=('plymouth-theme-hard-install-lera-sugar' 'plymouth-theme-hard-install-nier-a2') +provides=("melawy-plymouth-theme-hard-install") +depends=("melawy-plymouth-theme-fenek") +conflicts=("melawy-plymouth-theme-hard-install") install=ins.install - -package() { - echo -e "[Daemon]\nTheme=melawy-fenek\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "${srcdir}/plymouthd.melawy-fenek" - install -Dm644 "${srcdir}/plymouthd.melawy-fenek" "${pkgdir}/usr/share/plymouth/plymouthd.melawy-fenek" -} diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install index 80a2994..2e0895b 100644 --- a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install +++ b/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install @@ -4,3 +4,6 @@ post_install() { plymouth-set-default-theme --rebuild-initrd melawy-fenek } +post_upgrade() { + post_install +} diff --git a/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD b/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD index 39250e0..fc20495 100644 --- a/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD +++ b/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.5 +pkgver=1.9 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Fenek/melawy-refind-theme-fenek/ins.install b/Design/Fenek/melawy-refind-theme-fenek/ins.install index 10a4eef..21392c0 100644 --- a/Design/Fenek/melawy-refind-theme-fenek/ins.install +++ b/Design/Fenek/melawy-refind-theme-fenek/ins.install @@ -15,30 +15,56 @@ post_install() { fi echo "Found rEFInd in ${REFIND_DIR}" - echo "Installing theme in ${REFIND_DIR}/themes" - cd ${install_dir} - install -D -m0644 -t "${REFIND_DIR}/themes/$THEME_NAME/" *.conf - find . -exec install -D {} "${REFIND_DIR}/themes/$THEME_NAME/{}" \; - - cp -vrf "$install_dir" "${REFIND_DIR}/themes/$THEME_NAME/" - - REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" - EFI_THEME_PATH="${REFIND_DIR}/themes" - - RESULT=$(grep "theme" $REFIND_CONF_PATH) - - if [[ "$?" = "0" ]]; then - CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) - if [[ "$?" = "0" ]]; then - sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH - fi - else - if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then - echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH - else - echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi fi fi + + if [ -f "${REFIND_DIR}/refind_x64.efi" ]; then + echo "Installing theme in ${REFIND_DIR}/themes" + cd ${install_dir} + + mkdir -p "${REFIND_DIR}/themes/$THEME_NAME" + mkdir -p "${EFI_BOOT_DIR}/themes/$THEME_NAME" + + cp -vrf "$install_dir/." "${REFIND_DIR}/themes/$THEME_NAME/." + cp -vrf "$install_dir/." "${EFI_BOOT_DIR}/themes/$THEME_NAME/." + + # Remove all from "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${EFI_BOOT_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + rm -vr "${EFI_BOOT_DIR}/${i}" + done + + unset f_list + + # Copy all from "${REFIND_DIR}" to "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${REFIND_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + if [ -f ${REFIND_DIR}/${i} ]; then + cp -vf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + + if [ -d ${REFIND_DIR}/${i} ]; then + cp -vrf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + done + + unset f_list + + mv -vf "${EFI_BOOT_DIR}/refind_x64.efi" "${EFI_BOOT_DIR}/bootx64.efi" + fi } post_upgrade() { @@ -63,16 +89,32 @@ post_remove() { fi echo "Found rEFInd in ${REFIND_DIR}" + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + if [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${REFIND_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + fi + + if [[ -d "${EFI_BOOT_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${EFI_BOOT_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${EFI_BOOT_DIR}/themes/$THEME_NAME" + fi + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH - if ! [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then - echo "Theme already uninstalled" - exit 0 - fi - - rm -r "${REFIND_DIR}/themes/$THEME_NAME" - echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" } # Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore b/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore new file mode 100644 index 0000000..2f845d8 --- /dev/null +++ b/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-refind-theme-hard-install-fenek diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh b/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh b/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD b/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD new file mode 100644 index 0000000..641a93a --- /dev/null +++ b/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD @@ -0,0 +1,16 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.0 +pkgrel=1 +pkgdesc="Specific refind theme hard install Fenek for Melawy Linux" +url="https://git.melawy.ru/Design" +arch=("any") +license=("AGPL3") +source=() +provides=("melawy-refind-theme-hard-install") +depends=("melawy-refind-theme-fenek") +conflicts=("melawy-refind-theme-hard-install") + +install=ins.install diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install b/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install new file mode 100644 index 0000000..7ac1093 --- /dev/null +++ b/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install @@ -0,0 +1,127 @@ +post_install() { + THEME_NAME="melawy-fenek" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + + RESULT=$(grep "theme" $REFIND_CONF_PATH) + + if [[ "$?" = "0" ]]; then + CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) + if [[ "$?" = "0" ]]; then + sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH + fi + else + if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then + echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + else + echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + fi + fi + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +post_upgrade() { + post_install +} + +post_remove() { + THEME_NAME="melawy-fenek" + + echo "Removal of theme from EFI partition" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh +# Verify EFI System Partition +__has_esp__() { + __find_esp__ + + mount "$ESP" &>/dev/null + [[ -d "$ESP/EFI" ]] && return 0 || return 1 +} + +__find_esp__() { + local parttype + local fstype + local device + + while read -r device; do + read -r parttype fstype ESP <<<"$(lsblk -o "PARTTYPE,FSTYPE,MOUNTPOINT" "$device" 2>/dev/null | awk 'NR==2')" + + [[ "${parttype,,}" != "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" ]] && continue + [[ "${fstype,,}" != "vfat" ]] && continue + [[ -z $(findmnt -sn "$ESP") ]] && continue + + done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/efi" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/boot" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(bootctl --print-esp-path) + if [ -z "${ESP}" ]; then + exit 1 + fi + fi + fi + fi + + echo "Found ${ESP}" + readonly ESP +} diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD index b9f7d4d..60c91c4 100644 --- a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" arch=("any") license=("AGPL3") -depends=() +depends=("melawy-theme") optdepends=() makedepends=("git") backup=() diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD index ba1cb0e..7b09ff4 100644 --- a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD @@ -1,19 +1,16 @@ # Maintainer: Valeria Fadeeva -pkgname='melawy-plymouth-theme-hard-install-lera-sugar' +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") pkgver=1.0 pkgrel=1 -pkgdesc='Liveuser specific plymouth theme hard install Lera Sugar for Melawy Linux' -arch=('any') -url='https://git.melawy.ru/Design' -license=('AGPL3') +pkgdesc="Liveuser specific plymouth theme hard install Lera Sugar for Melawy Linux" +arch=("any") +url="https://git.melawy.ru/Design" +license=("AGPL3") source=() -depends=('melawy-plymouth-theme-lera-sugar') -conflict=('melawy-plymouth-theme-hard-install-fenek' 'plymouth-theme-hard-install-nier-a2') +provides=("melawy-plymouth-theme-hard-install") +depends=("melawy-plymouth-theme-lera-sugar") +conflicts=("melawy-plymouth-theme-hard-install") install=ins.install - -package() { - echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "${srcdir}/plymouthd.melawy-lera-sugar" - install -Dm644 "${srcdir}/plymouthd.melawy-lera-sugar" "${pkgdir}/usr/share/plymouth/plymouthd.melawy-lera-sugar" -} diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install index b65f99e..2a93360 100644 --- a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install +++ b/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install @@ -4,3 +4,6 @@ post_install() { plymouth-set-default-theme --rebuild-initrd melawy-lera-sugar } +post_upgrade() { + post_install +} diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD index a93fd9d..25329cc 100644 --- a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.16 +pkgver=1.20 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -35,3 +35,5 @@ package() { install -d "$pkgdir$THEME_PATH" cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/" } + +install=ins.install diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install new file mode 100644 index 0000000..4dd0d1c --- /dev/null +++ b/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install @@ -0,0 +1,9 @@ +post_install() { + if [ "$(grep 'Theme' /etc/plymouth/plymouthd.conf | cut -d'=' -f2)" == "melawy-lera-sugar" ]; then + plymouth-set-default-theme -R + fi +} + +post_upgrade() { + post_install +} diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore new file mode 100644 index 0000000..2f845d8 --- /dev/null +++ b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-refind-theme-hard-install-fenek diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD new file mode 100644 index 0000000..3efecf7 --- /dev/null +++ b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD @@ -0,0 +1,16 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.0 +pkgrel=1 +pkgdesc="Specific refind theme hard install Lera Sugar for Melawy Linux" +url="https://git.melawy.ru/Design" +arch=("any") +license=("AGPL3") +source=() +provides=("melawy-refind-theme-hard-install") +depends=("melawy-refind-theme-lera-sugar") +conflicts=("melawy-refind-theme-hard-install") + +install=ins.install diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install new file mode 100644 index 0000000..b4e7e9b --- /dev/null +++ b/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install @@ -0,0 +1,127 @@ +post_install() { + THEME_NAME="melawy-lera-sugar" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + + RESULT=$(grep "theme" $REFIND_CONF_PATH) + + if [[ "$?" = "0" ]]; then + CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) + if [[ "$?" = "0" ]]; then + sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH + fi + else + if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then + echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + else + echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + fi + fi + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +post_upgrade() { + post_install +} + +post_remove() { + THEME_NAME="melawy-lera-sugar" + + echo "Removal of theme from EFI partition" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh +# Verify EFI System Partition +__has_esp__() { + __find_esp__ + + mount "$ESP" &>/dev/null + [[ -d "$ESP/EFI" ]] && return 0 || return 1 +} + +__find_esp__() { + local parttype + local fstype + local device + + while read -r device; do + read -r parttype fstype ESP <<<"$(lsblk -o "PARTTYPE,FSTYPE,MOUNTPOINT" "$device" 2>/dev/null | awk 'NR==2')" + + [[ "${parttype,,}" != "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" ]] && continue + [[ "${fstype,,}" != "vfat" ]] && continue + [[ -z $(findmnt -sn "$ESP") ]] && continue + + done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/efi" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/boot" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(bootctl --print-esp-path) + if [ -z "${ESP}" ]; then + exit 1 + fi + fi + fi + fi + + echo "Found ${ESP}" + readonly ESP +} diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD index ec20aca..d9b8358 100644 --- a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.11 +pkgver=1.15 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install index a0d5f29..274cd5d 100644 --- a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install +++ b/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install @@ -15,30 +15,56 @@ post_install() { fi echo "Found rEFInd in ${REFIND_DIR}" - echo "Installing theme in ${REFIND_DIR}/themes" - cd ${install_dir} - install -D -m0644 -t "${REFIND_DIR}/themes/$THEME_NAME/" *.conf - find . -exec install -D {} "${REFIND_DIR}/themes/$THEME_NAME/{}" \; - - cp -vrf "$install_dir" "${REFIND_DIR}/themes/$THEME_NAME/" - - REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" - EFI_THEME_PATH="${REFIND_DIR}/themes" - - RESULT=$(grep "theme" $REFIND_CONF_PATH) - - if [[ "$?" = "0" ]]; then - CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) - if [[ "$?" = "0" ]]; then - sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH - fi - else - if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then - echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH - else - echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi fi fi + + if [ -f "${REFIND_DIR}/refind_x64.efi" ]; then + echo "Installing theme in ${REFIND_DIR}/themes" + cd ${install_dir} + + mkdir -p "${REFIND_DIR}/themes/$THEME_NAME" + mkdir -p "${EFI_BOOT_DIR}/themes/$THEME_NAME" + + cp -vrf "$install_dir/." "${REFIND_DIR}/themes/$THEME_NAME/." + cp -vrf "$install_dir/." "${EFI_BOOT_DIR}/themes/$THEME_NAME/." + + # Remove all from "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${EFI_BOOT_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + rm -vr "${EFI_BOOT_DIR}/${i}" + done + + unset f_list + + # Copy all from "${REFIND_DIR}" to "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${REFIND_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + if [ -f ${REFIND_DIR}/${i} ]; then + cp -vf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + + if [ -d ${REFIND_DIR}/${i} ]; then + cp -vrf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + done + + unset f_list + + mv -vf "${EFI_BOOT_DIR}/refind_x64.efi" "${EFI_BOOT_DIR}/bootx64.efi" + fi } post_upgrade() { @@ -63,16 +89,32 @@ post_remove() { fi echo "Found rEFInd in ${REFIND_DIR}" + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + if [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${REFIND_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + fi + + if [[ -d "${EFI_BOOT_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${EFI_BOOT_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${EFI_BOOT_DIR}/themes/$THEME_NAME" + fi + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH - if ! [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then - echo "Theme already uninstalled" - exit 0 - fi - - rm -r "${REFIND_DIR}/themes/$THEME_NAME" - echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" } # Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh diff --git a/Design/Melawy/melawy-icon-theme/00_make.sh b/Design/Melawy/melawy-icon-theme/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-icon-theme/00_make.sh +++ b/Design/Melawy/melawy-icon-theme/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-purple-dark-cursors/00_make.sh b/Design/Melawy/melawy-purple-dark-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-purple-dark-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-dark-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh b/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-purple-light-cursors/00_make.sh b/Design/Melawy/melawy-purple-light-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-purple-light-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-light-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh b/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-red-dark-cursors/00_make.sh b/Design/Melawy/melawy-red-dark-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-red-dark-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-dark-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh b/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-red-light-cursors/00_make.sh b/Design/Melawy/melawy-red-light-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-red-light-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-light-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-red-light-default-cursors/00_make.sh b/Design/Melawy/melawy-red-light-default-cursors/00_make.sh index 912c96f..30b8975 100755 --- a/Design/Melawy/melawy-red-light-default-cursors/00_make.sh +++ b/Design/Melawy/melawy-red-light-default-cursors/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Design/Melawy/melawy-theme/PKGBUILD b/Design/Melawy/melawy-theme/PKGBUILD index 7928756..0250f12 100644 --- a/Design/Melawy/melawy-theme/PKGBUILD +++ b/Design/Melawy/melawy-theme/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD index b9f7d4d..60c91c4 100644 --- a/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD +++ b/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" arch=("any") license=("AGPL3") -depends=() +depends=("melawy-theme") optdepends=() makedepends=("git") backup=() diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD index a681d9f..6927a95 100644 --- a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD +++ b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD @@ -1,19 +1,16 @@ # Maintainer: Valeria Fadeeva -pkgname='melawy-plymouth-theme-hard-install-nier-a2' +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") pkgver=1.0 pkgrel=1 -pkgdesc='Liveuser specific plymouth theme hard install Nier A2 for Melawy Linux' -arch=('any') -url='https://git.melawy.ru/Design' -license=('AGPL3') +pkgdesc="Liveuser specific plymouth theme hard install Nier A2 for Melawy Linux" +url="https://git.melawy.ru/Design" +arch=("any") +license=("AGPL3") source=() -depends=('melawy-plymouth-theme-nier-a2') -conflict=('plymouth-theme-hard-install-lera-sugar' 'melawy-plymouth-theme-hard-install-fenek') +provides=("melawy-plymouth-theme-hard-install") +depends=("melawy-plymouth-theme-nier-a2") +conflicts=("melawy-plymouth-theme-hard-install") install=ins.install - -package() { - echo -e "[Daemon]\nTheme=melawy-nier-a2\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "${srcdir}/plymouthd.melawy-nier-a2" - install -Dm644 "${srcdir}/plymouthd.melawy-nier-a2" "${pkgdir}/usr/share/plymouth/plymouthd.melawy-nier-a2" -} diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install index b96659c..df3d24c 100644 --- a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install +++ b/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install @@ -4,3 +4,6 @@ post_install() { plymouth-set-default-theme --rebuild-initrd melawy-nier-a2 } +post_upgrade() { + post_install +} diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD index fa95c8c..147e47e 100644 --- a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD +++ b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.8 +pkgver=1.12 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -35,3 +35,5 @@ package() { install -d "$pkgdir$THEME_PATH" cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir$THEME_PATH/" } + +install=ins.install diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install new file mode 100644 index 0000000..084771b --- /dev/null +++ b/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install @@ -0,0 +1,9 @@ +post_install() { + if [ "$(grep 'Theme' /etc/plymouth/plymouthd.conf | cut -d'=' -f2)" == "melawy-nier-a2" ]; then + plymouth-set-default-theme -R + fi +} + +post_upgrade() { + post_install +} diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore new file mode 100644 index 0000000..2f845d8 --- /dev/null +++ b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-refind-theme-hard-install-fenek diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD new file mode 100644 index 0000000..056000f --- /dev/null +++ b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD @@ -0,0 +1,16 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.0 +pkgrel=1 +pkgdesc="Specific refind theme hard install Nier A2 for Melawy Linux" +url="https://git.melawy.ru/Design" +arch=("any") +license=("AGPL3") +source=() +provides=("melawy-refind-theme-hard-install") +depends=("melawy-refind-theme-nier-a2") +conflicts=("melawy-refind-theme-hard-install") + +install=ins.install diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install new file mode 100644 index 0000000..ac9fed4 --- /dev/null +++ b/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install @@ -0,0 +1,127 @@ +post_install() { + THEME_NAME="melawy-nier-a2" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + + RESULT=$(grep "theme" $REFIND_CONF_PATH) + + if [[ "$?" = "0" ]]; then + CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) + if [[ "$?" = "0" ]]; then + sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH + fi + else + if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then + echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + else + echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + fi + fi + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +post_upgrade() { + post_install +} + +post_remove() { + THEME_NAME="melawy-nier-a2" + + echo "Removal of theme from EFI partition" + + echo "Searching rEFInd installation in EFI partition..." + if ! __has_esp__; then + echo "EFI partition not found" >&2 + exit 1 + fi + + REFIND_DIR=$(find "$ESP" -type d -iname refind) + if ! [[ -d "${REFIND_DIR}" ]]; then + echo "rEFInd not installed in $ESP" >&2 + exit 1 + fi + echo "Found rEFInd in ${REFIND_DIR}" + + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" + sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH + + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" +} + +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh +# Verify EFI System Partition +__has_esp__() { + __find_esp__ + + mount "$ESP" &>/dev/null + [[ -d "$ESP/EFI" ]] && return 0 || return 1 +} + +__find_esp__() { + local parttype + local fstype + local device + + while read -r device; do + read -r parttype fstype ESP <<<"$(lsblk -o "PARTTYPE,FSTYPE,MOUNTPOINT" "$device" 2>/dev/null | awk 'NR==2')" + + [[ "${parttype,,}" != "c12a7328-f81f-11d2-ba4b-00a0c93ec93b" ]] && continue + [[ "${fstype,,}" != "vfat" ]] && continue + [[ -z $(findmnt -sn "$ESP") ]] && continue + + done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/efi" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(grep -i "/boot" /etc/fstab | awk '{print $2}') + if [ -z "${ESP}" ]; then + ESP=$(bootctl --print-esp-path) + if [ -z "${ESP}" ]; then + exit 1 + fi + fi + fi + fi + + echo "Found ${ESP}" + readonly ESP +} diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD b/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD index 0c2a1fb..637f171 100644 --- a/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD +++ b/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.6 +pkgver=1.10 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install b/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install index c441bc1..a33734c 100644 --- a/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install +++ b/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install @@ -15,30 +15,56 @@ post_install() { fi echo "Found rEFInd in ${REFIND_DIR}" - echo "Installing theme in ${REFIND_DIR}/themes" - cd ${install_dir} - install -D -m0644 -t "${REFIND_DIR}/themes/$THEME_NAME/" *.conf - find . -exec install -D {} "${REFIND_DIR}/themes/$THEME_NAME/{}" \; - - cp -vrf "$install_dir" "${REFIND_DIR}/themes/$THEME_NAME/" - - REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" - EFI_THEME_PATH="${REFIND_DIR}/themes" - - RESULT=$(grep "theme" $REFIND_CONF_PATH) - - if [[ "$?" = "0" ]]; then - CURRENT_THEME=$(echo $RESULT | cut -d"/" -f2) - if [[ "$?" = "0" ]]; then - sed -e "s/$CURRENT_THEME/$THEME_NAME/g" -i $REFIND_CONF_PATH - fi - else - if [[ -z "$(tail -n 1 -c 1 $REFIND_CONF_PATH)" ]];then - echo "include themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH - else - echo -e "\ninclude themes/$THEME_NAME/theme.conf" >> $REFIND_CONF_PATH + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi fi fi + + if [ -f "${REFIND_DIR}/refind_x64.efi" ]; then + echo "Installing theme in ${REFIND_DIR}/themes" + cd ${install_dir} + + mkdir -p "${REFIND_DIR}/themes/$THEME_NAME" + mkdir -p "${EFI_BOOT_DIR}/themes/$THEME_NAME" + + cp -vrf "$install_dir/." "${REFIND_DIR}/themes/$THEME_NAME/." + cp -vrf "$install_dir/." "${EFI_BOOT_DIR}/themes/$THEME_NAME/." + + # Remove all from "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${EFI_BOOT_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + rm -vr "${EFI_BOOT_DIR}/${i}" + done + + unset f_list + + # Copy all from "${REFIND_DIR}" to "${EFI_BOOT_DIR}" except "themes" + f_list=$(ls -1 "${REFIND_DIR}" | grep -v "themes") + + for i in ${f_list[@]} + do + if [ -f ${REFIND_DIR}/${i} ]; then + cp -vf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + + if [ -d ${REFIND_DIR}/${i} ]; then + cp -vrf "${REFIND_DIR}/${i}" "${EFI_BOOT_DIR}/${i}" + fi + done + + unset f_list + + mv -vf "${EFI_BOOT_DIR}/refind_x64.efi" "${EFI_BOOT_DIR}/bootx64.efi" + fi } post_upgrade() { @@ -63,16 +89,32 @@ post_remove() { fi echo "Found rEFInd in ${REFIND_DIR}" + EFI_BOOT_DIR=$(find "$ESP" -type d -iname boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname Boot) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + EFI_BOOT_DIR=$(find "$ESP" -type d -iname BOOT) + if ! [[ -d "${EFI_BOOT_DIR}" ]]; then + mkdir -p "$(dirname ${REFIND_DIR})/boot" + EFI_BOOT_DIR="$(dirname ${REFIND_DIR})/boot" + fi + fi + fi + + if [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${REFIND_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + fi + + if [[ -d "${EFI_BOOT_DIR}/themes/$THEME_NAME" ]]; then + rm -vr "${EFI_BOOT_DIR}/themes/$THEME_NAME" + echo "Theme uninstalled from ${EFI_BOOT_DIR}/themes/$THEME_NAME" + fi + REFIND_CONF_PATH="${REFIND_DIR}/refind.conf" sed -i "/$THEME_NAME/d" $REFIND_CONF_PATH - if ! [[ -d "${REFIND_DIR}/themes/$THEME_NAME" ]]; then - echo "Theme already uninstalled" - exit 0 - fi - - rm -r "${REFIND_DIR}/themes/$THEME_NAME" - echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" + cp -vf "${REFIND_DIR}/refind.conf" "${EFI_BOOT_DIR}/refind.conf" } # Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh diff --git a/Design/Win11/melawy-kde-theme-win11/PKGBUILD b/Design/Win11/melawy-kde-theme-win11/PKGBUILD index b9f7d4d..a36be5f 100644 --- a/Design/Win11/melawy-kde-theme-win11/PKGBUILD +++ b/Design/Win11/melawy-kde-theme-win11/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.1 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" arch=("any") license=("AGPL3") -depends=() +depends=("melawy-theme") optdepends=() makedepends=("git") backup=() diff --git a/Design/Win11/melawy-kde-theme-win11/README.md b/Design/Win11/melawy-kde-theme-win11/README.md index f310ab3..9cc62ba 100644 --- a/Design/Win11/melawy-kde-theme-win11/README.md +++ b/Design/Win11/melawy-kde-theme-win11/README.md @@ -1,4 +1,4 @@ -# melawy-kde-theme-nier-a2 +# melawy-kde-theme-win11 KDE theme for Melawy Linux ### Donate diff --git a/Design/Win11/melawy-kde-theme-win12/.gitignore b/Design/Win11/melawy-kde-theme-win12/.gitignore new file mode 100644 index 0000000..369a647 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-kde-theme-win11 diff --git a/Design/Win11/melawy-kde-theme-win12/00_make.sh b/Design/Win11/melawy-kde-theme-win12/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/00_make.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +echo "Ready" diff --git a/Design/Win11/melawy-kde-theme-win12/01_sign.sh b/Design/Win11/melawy-kde-theme-win12/01_sign.sh new file mode 100755 index 0000000..77055f1 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/01_sign.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done + +for i in *.pkg.tar.xz; +do + if [ -f "${i}" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi +done diff --git a/Design/Win11/melawy-kde-theme-win12/PKGBUILD b/Design/Win11/melawy-kde-theme-win12/PKGBUILD new file mode 100644 index 0000000..a36be5f --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/PKGBUILD @@ -0,0 +1,33 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.5 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +url="https://git.melawy.ru/Design/$_gitname" +arch=("any") +license=("AGPL3") +depends=("melawy-theme") +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 --no-preserve=mode "$srcdir/$_gitname/usr" "$pkgdir/" +} diff --git a/Design/Win11/melawy-kde-theme-win12/README.md b/Design/Win11/melawy-kde-theme-win12/README.md new file mode 100644 index 0000000..1b1cc14 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/README.md @@ -0,0 +1,11 @@ +# melawy-kde-theme-win12 +KDE theme for Melawy Linux + +### Donate +[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) + +[YooMoney](https://yoomoney.ru/to/4100115921160758) + +[Qiwi](https://qiwi.com/n/VALERIAFADEEVA) + +Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/FETCH_HEAD b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/FETCH_HEAD new file mode 100644 index 0000000..1ca2259 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/FETCH_HEAD @@ -0,0 +1 @@ +f9341bfa3dedc4fbfe27d14471b7dac7bf8b77ba not-for-merge branch 'main' of https://git.melawy.ru/Design/melawy-kde-theme-win12 diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/HEAD b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/HEAD new file mode 100644 index 0000000..b870d82 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/config b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/config new file mode 100644 index 0000000..a346d32 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://git.melawy.ru/Design/melawy-kde-theme-win12.git + fetch = +refs/*:refs/* + mirror = true diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/description b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/applypatch-msg.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/commit-msg.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/fsmonitor-watchman.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..23e856f --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/post-update.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-applypatch.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-commit.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-merge-commit.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-push.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-rebase.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-receive.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/prepare-commit-msg.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/push-to-checkout.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &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/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/update.sample b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/update.sample new file mode 100755 index 0000000..c4d426b --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/info/exclude b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/14/bba9d5a0a0348540e1812bc46bd754296e4e73 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/14/bba9d5a0a0348540e1812bc46bd754296e4e73 new file mode 100644 index 0000000..6e53d2b Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/14/bba9d5a0a0348540e1812bc46bd754296e4e73 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/1c0609be43add8f21d1be7fd0c15e66846cd48 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/1c0609be43add8f21d1be7fd0c15e66846cd48 new file mode 100644 index 0000000..0a12890 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/1c0609be43add8f21d1be7fd0c15e66846cd48 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/7626afff3f84265de9d607714ff750288623fe b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/7626afff3f84265de9d607714ff750288623fe new file mode 100644 index 0000000..8748ecd Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/7626afff3f84265de9d607714ff750288623fe differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1a/8efba543041d16e7dce96629cf862849d21b6a b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1a/8efba543041d16e7dce96629cf862849d21b6a new file mode 100644 index 0000000..7f993e7 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1a/8efba543041d16e7dce96629cf862849d21b6a differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1b/990944ac160ee7824513d4652eaf7fd55a1ad2 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1b/990944ac160ee7824513d4652eaf7fd55a1ad2 new file mode 100644 index 0000000..ff77fce Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1b/990944ac160ee7824513d4652eaf7fd55a1ad2 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1c/fd84c00ff0fd965c6fcceeb60e908c30d7604a b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1c/fd84c00ff0fd965c6fcceeb60e908c30d7604a new file mode 100644 index 0000000..3a880fd Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1c/fd84c00ff0fd965c6fcceeb60e908c30d7604a differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/27/7e7d0965a7c3165e7d6d43dd6791767d623081 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/27/7e7d0965a7c3165e7d6d43dd6791767d623081 new file mode 100644 index 0000000..44d59f5 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/27/7e7d0965a7c3165e7d6d43dd6791767d623081 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/2b/2ddc81ab982eca31f2850cc5e0e3472538c3ec b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/2b/2ddc81ab982eca31f2850cc5e0e3472538c3ec new file mode 100644 index 0000000..f118823 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/2b/2ddc81ab982eca31f2850cc5e0e3472538c3ec differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5d/e3bf4303bf814cdfbf0ae3b84658703c8233bf b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5d/e3bf4303bf814cdfbf0ae3b84658703c8233bf new file mode 100644 index 0000000..f258a01 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5d/e3bf4303bf814cdfbf0ae3b84658703c8233bf differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5f/68d3ec3c9bac86a3ce84a0f0c629c86f51bc41 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5f/68d3ec3c9bac86a3ce84a0f0c629c86f51bc41 new file mode 100644 index 0000000..283b183 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5f/68d3ec3c9bac86a3ce84a0f0c629c86f51bc41 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/65/1c9a131aed13275c83fc9b2f8b1a634b6c5a0c b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/65/1c9a131aed13275c83fc9b2f8b1a634b6c5a0c new file mode 100644 index 0000000..7f3895c Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/65/1c9a131aed13275c83fc9b2f8b1a634b6c5a0c differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/6f/89099c6dd0d3639ca11f9fdd1c9c2050a93f2d b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/6f/89099c6dd0d3639ca11f9fdd1c9c2050a93f2d new file mode 100644 index 0000000..59ada07 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/6f/89099c6dd0d3639ca11f9fdd1c9c2050a93f2d differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/76/22c3e9ad709308e638f6d014ccc9265d1b9921 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/76/22c3e9ad709308e638f6d014ccc9265d1b9921 new file mode 100644 index 0000000..1d46997 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/76/22c3e9ad709308e638f6d014ccc9265d1b9921 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/8c/e90db613cad5f2b2dd0037bf32fa18e3413029 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/8c/e90db613cad5f2b2dd0037bf32fa18e3413029 new file mode 100644 index 0000000..ba96126 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/8c/e90db613cad5f2b2dd0037bf32fa18e3413029 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/b9/2ce73db50a13965ee280389e4df59d2fdf4235 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/b9/2ce73db50a13965ee280389e4df59d2fdf4235 new file mode 100644 index 0000000..fa42acf Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/b9/2ce73db50a13965ee280389e4df59d2fdf4235 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e4/c9c5f7890111e3621d2653ddfc6384420b0444 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e4/c9c5f7890111e3621d2653ddfc6384420b0444 new file mode 100644 index 0000000..e51b767 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e4/c9c5f7890111e3621d2653ddfc6384420b0444 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e7/afdd6525fb131144f41607b8ac6708b2470c48 b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e7/afdd6525fb131144f41607b8ac6708b2470c48 new file mode 100644 index 0000000..f02bd43 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e7/afdd6525fb131144f41607b8ac6708b2470c48 differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/f9/341bfa3dedc4fbfe27d14471b7dac7bf8b77ba b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/f9/341bfa3dedc4fbfe27d14471b7dac7bf8b77ba new file mode 100644 index 0000000..b0718c3 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/f9/341bfa3dedc4fbfe27d14471b7dac7bf8b77ba differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.idx b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.idx new file mode 100644 index 0000000..96d4fbd Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.idx differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.pack b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.pack new file mode 100644 index 0000000..7443942 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.pack differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.rev b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.rev new file mode 100644 index 0000000..86044d7 Binary files /dev/null and b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.rev differ diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/packed-refs b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/packed-refs new file mode 100644 index 0000000..bca8389 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +b80f7aa36d70f2c6f63456d4d35c27335d29e81a refs/heads/main diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/refs/heads/main b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/refs/heads/main new file mode 100644 index 0000000..e0c8ac2 --- /dev/null +++ b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/refs/heads/main @@ -0,0 +1 @@ +f9341bfa3dedc4fbfe27d14471b7dac7bf8b77ba diff --git a/Design/Win11/melawy-win11-icon-theme/PKGBUILD b/Design/Win11/melawy-win11-icon-theme/PKGBUILD index 5c15018..dd778f9 100644 --- a/Design/Win11/melawy-win11-icon-theme/PKGBUILD +++ b/Design/Win11/melawy-win11-icon-theme/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname" "melawy-win11-icon-theme-special" "melawy-win11-icon-theme-white") -pkgver=1.175 +pkgver=1.122 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/make.sh b/Design/make.sh index 72e760d..4c9a004 100755 --- a/Design/make.sh +++ b/Design/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Installer/make.sh b/Installer/make.sh index 608bc65..f18c58b 100755 --- a/Installer/make.sh +++ b/Installer/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Installer/melawy-calamares-config/PKGBUILD b/Installer/melawy-calamares-config/PKGBUILD index 041c200..3d8aac2 100644 --- a/Installer/melawy-calamares-config/PKGBUILD +++ b/Installer/melawy-calamares-config/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer : Valeria Fadeeva # Calamares installer (fork from EndeavourOS) configured for Melawy Linux -_gitname="melawy-calamares-qt5" +_gitname="melawy-calamares-qt6" pkgname="$(basename $(pwd))" release_name=$pkgname -pkgver=3.3.0.11064 +pkgver=3.3.0.10975 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD b/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD new file mode 100644 index 0000000..c80097a --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD @@ -0,0 +1 @@ +0690ce0ed3353561eac17de6120d384362b5a50b not-for-merge branch 'calamares' of https://git.melawy.ru/Installer/melawy-calamares-qt6 diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/HEAD b/Installer/melawy-calamares-config/melawy-calamares-qt6/HEAD new file mode 100644 index 0000000..015d909 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/HEAD @@ -0,0 +1 @@ +ref: refs/heads/calamares diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/config b/Installer/melawy-calamares-config/melawy-calamares-qt6/config new file mode 100644 index 0000000..f20f659 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://git.melawy.ru/Installer/melawy-calamares-qt6.git + fetch = +refs/*:refs/* + mirror = true diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/description b/Installer/melawy-calamares-config/melawy-calamares-qt6/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/applypatch-msg.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/commit-msg.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/fsmonitor-watchman.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..23e856f --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/post-update.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-applypatch.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-commit.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-merge-commit.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-push.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-rebase.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-receive.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/prepare-commit-msg.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/push-to-checkout.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &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/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/update.sample b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/update.sample new file mode 100755 index 0000000..c4d426b --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/info/exclude b/Installer/melawy-calamares-config/melawy-calamares-qt6/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.idx new file mode 100644 index 0000000..2902812 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.pack new file mode 100644 index 0000000..7ba88c0 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.rev new file mode 100644 index 0000000..bbd96d4 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.idx new file mode 100644 index 0000000..ee393ac Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.pack new file mode 100644 index 0000000..2c45253 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.rev new file mode 100644 index 0000000..929b3e8 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.idx new file mode 100644 index 0000000..1332d42 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.pack new file mode 100644 index 0000000..5dbbcfc Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.rev new file mode 100644 index 0000000..188dc44 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.idx new file mode 100644 index 0000000..5ab052e Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.pack new file mode 100644 index 0000000..5463be1 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.rev new file mode 100644 index 0000000..247572e Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.idx new file mode 100644 index 0000000..508dcb0 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.pack new file mode 100644 index 0000000..036a0d3 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.rev new file mode 100644 index 0000000..6ea1909 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.idx new file mode 100644 index 0000000..49934d5 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.pack new file mode 100644 index 0000000..5bbf8ac Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.rev new file mode 100644 index 0000000..c665936 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.idx new file mode 100644 index 0000000..0c14181 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.pack new file mode 100644 index 0000000..1437c58 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.rev new file mode 100644 index 0000000..1ee65e9 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.idx new file mode 100644 index 0000000..678fe10 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.idx differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.pack new file mode 100644 index 0000000..0793309 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.pack differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.rev new file mode 100644 index 0000000..1a9ad49 Binary files /dev/null and b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.rev differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs b/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs new file mode 100644 index 0000000..aadfc4e --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +ee012f90eb0f06003c805032a577bf6668ee6a5b refs/heads/calamares diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/refs/heads/calamares b/Installer/melawy-calamares-config/melawy-calamares-qt6/refs/heads/calamares new file mode 100644 index 0000000..9b98f59 --- /dev/null +++ b/Installer/melawy-calamares-config/melawy-calamares-qt6/refs/heads/calamares @@ -0,0 +1 @@ +0690ce0ed3353561eac17de6120d384362b5a50b diff --git a/Installer/melawy-calamares-qt5/00_make.sh b/Installer/melawy-calamares-qt5/00_make.sh index c7436db..4b80191 100755 --- a/Installer/melawy-calamares-qt5/00_make.sh +++ b/Installer/melawy-calamares-qt5/00_make.sh @@ -22,6 +22,6 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Installer/melawy-calamares-qt5/PKGBUILD b/Installer/melawy-calamares-qt5/PKGBUILD index 2d9da06..dd5f539 100644 --- a/Installer/melawy-calamares-qt5/PKGBUILD +++ b/Installer/melawy-calamares-qt5/PKGBUILD @@ -4,7 +4,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.11062 +pkgver=3.3.0.11076 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Installer/melawy-calamares-qt6/00_make.sh b/Installer/melawy-calamares-qt6/00_make.sh index c7436db..4b80191 100755 --- a/Installer/melawy-calamares-qt6/00_make.sh +++ b/Installer/melawy-calamares-qt6/00_make.sh @@ -22,6 +22,6 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Installer/melawy-calamares-qt6/PKGBUILD b/Installer/melawy-calamares-qt6/PKGBUILD index b0d18d0..bdc0215 100644 --- a/Installer/melawy-calamares-qt6/PKGBUILD +++ b/Installer/melawy-calamares-qt6/PKGBUILD @@ -4,7 +4,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.10964 +pkgver=3.3.0.10975 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Installer/melawy-welcome/00_make.sh b/Installer/melawy-welcome/00_make.sh index 912c96f..30b8975 100755 --- a/Installer/melawy-welcome/00_make.sh +++ b/Installer/melawy-welcome/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Installer/melawy-welcome/PKGBUILD b/Installer/melawy-welcome/PKGBUILD index 530814e..ac569b7 100644 --- a/Installer/melawy-welcome/PKGBUILD +++ b/Installer/melawy-welcome/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=0.10.1.207 +pkgver=0.10.1.208 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('x86_64') diff --git a/Menu/make.sh b/Menu/make.sh index 608bc65..f18c58b 100755 --- a/Menu/make.sh +++ b/Menu/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD b/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD index b31b3f1..0da5c67 100644 --- a/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD +++ b/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.5 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Menu/$_gitname" diff --git a/Never/make.sh b/Never/make.sh index cd79738..ca45744 100755 --- a/Never/make.sh +++ b/Never/make.sh @@ -62,6 +62,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Never/paru-bin/00_make.sh b/Never/paru-bin/00_make.sh index 912c96f..30b8975 100755 --- a/Never/paru-bin/00_make.sh +++ b/Never/paru-bin/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Never/paru-git/00_make.sh b/Never/paru-git/00_make.sh index 912c96f..30b8975 100755 --- a/Never/paru-git/00_make.sh +++ b/Never/paru-git/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Never/paru/00_make.sh b/Never/paru/00_make.sh index 912c96f..30b8975 100755 --- a/Never/paru/00_make.sh +++ b/Never/paru/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/One_per_month/linux-xanmod-anbox b/One_per_month/linux-xanmod-anbox index 4d0a66e..6d395e7 160000 --- a/One_per_month/linux-xanmod-anbox +++ b/One_per_month/linux-xanmod-anbox @@ -1 +1 @@ -Subproject commit 4d0a66e8f6c2500df6eddd95756196d11d5641d9 +Subproject commit 6d395e789bf1c1f95189f737277c8e36864c76e1 diff --git a/One_per_month/make.sh b/One_per_month/make.sh index 433ea6a..58c3e6e 100755 --- a/One_per_month/make.sh +++ b/One_per_month/make.sh @@ -62,6 +62,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Plasmoids/make.sh b/Plasmoids/make.sh index 608bc65..f18c58b 100755 --- a/Plasmoids/make.sh +++ b/Plasmoids/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Updater/make.sh b/Updater/make.sh index 608bc65..f18c58b 100755 --- a/Updater/make.sh +++ b/Updater/make.sh @@ -57,6 +57,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 999999999 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Updater/melawy-arch-linux-updater/00_make.sh b/Updater/melawy-arch-linux-updater/00_make.sh index 912c96f..30b8975 100755 --- a/Updater/melawy-arch-linux-updater/00_make.sh +++ b/Updater/melawy-arch-linux-updater/00_make.sh @@ -23,6 +23,6 @@ do done echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 999999999 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready" diff --git a/Updater/melawy-arch-linux-updater/PKGBUILD b/Updater/melawy-arch-linux-updater/PKGBUILD index 8d009d2..f5f69d9 100644 --- a/Updater/melawy-arch-linux-updater/PKGBUILD +++ b/Updater/melawy-arch-linux-updater/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.16 +pkgver=1.17 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/push.sh b/push.sh index ebfdf06..cb2e419 100755 --- a/push.sh +++ b/push.sh @@ -2,6 +2,6 @@ git add . && git commit -m "Update" && git push -notify-send -a "$(basename $(pwd)): Push" -t 999999999 "Update finished" "$(date '+%Y.%m.%d %H:%M:%S')" +notify-send -a "$(basename $(pwd)): Push" -t 10000 "Update finished" "$(date '+%Y.%m.%d %H:%M:%S')" echo "Ready"