diff --git a/3party/audio-recorder b/3PARTY/3party/audio-recorder similarity index 100% rename from 3party/audio-recorder rename to 3PARTY/3party/audio-recorder diff --git a/3party/bluetooth-autoconnect b/3PARTY/3party/bluetooth-autoconnect similarity index 100% rename from 3party/bluetooth-autoconnect rename to 3PARTY/3party/bluetooth-autoconnect diff --git a/3party/bluetooth-support b/3PARTY/3party/bluetooth-support similarity index 100% rename from 3party/bluetooth-support rename to 3PARTY/3party/bluetooth-support diff --git a/3party/cachyos-kernel-manager/.SRCINFO b/3PARTY/3party/cachyos-kernel-manager/.SRCINFO similarity index 100% rename from 3party/cachyos-kernel-manager/.SRCINFO rename to 3PARTY/3party/cachyos-kernel-manager/.SRCINFO diff --git a/3party/cachyos-kernel-manager/00_make.sh b/3PARTY/3party/cachyos-kernel-manager/00_make.sh similarity index 100% rename from 3party/cachyos-kernel-manager/00_make.sh rename to 3PARTY/3party/cachyos-kernel-manager/00_make.sh diff --git a/3party/cachyos-kernel-manager/01_sign.sh b/3PARTY/3party/cachyos-kernel-manager/01_sign.sh similarity index 100% rename from 3party/cachyos-kernel-manager/01_sign.sh rename to 3PARTY/3party/cachyos-kernel-manager/01_sign.sh diff --git a/3party/cachyos-kernel-manager/PKGBUILD b/3PARTY/3party/cachyos-kernel-manager/PKGBUILD similarity index 100% rename from 3party/cachyos-kernel-manager/PKGBUILD rename to 3PARTY/3party/cachyos-kernel-manager/PKGBUILD diff --git a/3party/cachyos-kernel-manager/PKGBUILD_ b/3PARTY/3party/cachyos-kernel-manager/PKGBUILD_ similarity index 100% rename from 3party/cachyos-kernel-manager/PKGBUILD_ rename to 3PARTY/3party/cachyos-kernel-manager/PKGBUILD_ diff --git a/3party/cachyos-kernel-manager/fix-installed-db.patch b/3PARTY/3party/cachyos-kernel-manager/fix-installed-db.patch similarity index 100% rename from 3party/cachyos-kernel-manager/fix-installed-db.patch rename to 3PARTY/3party/cachyos-kernel-manager/fix-installed-db.patch diff --git a/3party/cachyos-kernel-manager/kernel-manager/FETCH_HEAD b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/FETCH_HEAD similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/FETCH_HEAD rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/FETCH_HEAD diff --git a/3party/cachyos-kernel-manager/kernel-manager/HEAD b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/HEAD similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/HEAD rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/HEAD diff --git a/3party/cachyos-kernel-manager/kernel-manager/config b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/config similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/config rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/config diff --git a/3party/cachyos-kernel-manager/kernel-manager/description b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/description similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/description rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/description diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/applypatch-msg.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/applypatch-msg.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/applypatch-msg.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/applypatch-msg.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/commit-msg.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/commit-msg.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/commit-msg.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/commit-msg.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/fsmonitor-watchman.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/fsmonitor-watchman.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/fsmonitor-watchman.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/fsmonitor-watchman.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/post-update.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/post-update.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/post-update.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/post-update.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-applypatch.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-applypatch.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-applypatch.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-applypatch.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-commit.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-commit.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-commit.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-commit.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-merge-commit.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-merge-commit.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-merge-commit.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-merge-commit.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-push.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-push.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-push.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-push.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-rebase.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-rebase.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-rebase.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-rebase.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-receive.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-receive.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/pre-receive.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/pre-receive.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/prepare-commit-msg.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/prepare-commit-msg.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/prepare-commit-msg.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/prepare-commit-msg.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/push-to-checkout.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/push-to-checkout.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/push-to-checkout.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/push-to-checkout.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/sendemail-validate.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/sendemail-validate.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/sendemail-validate.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/sendemail-validate.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/hooks/update.sample b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/update.sample similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/hooks/update.sample rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/hooks/update.sample diff --git a/3party/cachyos-kernel-manager/kernel-manager/info/exclude b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/info/exclude similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/info/exclude rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/info/exclude diff --git a/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.idx b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.idx similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.idx rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.idx diff --git a/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.pack b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.pack similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.pack rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.pack diff --git a/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.rev b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.rev similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.rev rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/objects/pack/pack-a9d2cca225e96e2f5ca970cd0eabb97d1e430d84.rev diff --git a/3party/cachyos-kernel-manager/kernel-manager/packed-refs b/3PARTY/3party/cachyos-kernel-manager/kernel-manager/packed-refs similarity index 100% rename from 3party/cachyos-kernel-manager/kernel-manager/packed-refs rename to 3PARTY/3party/cachyos-kernel-manager/kernel-manager/packed-refs diff --git a/3party/cachyos-kernel-manager/makepkg-clang-without-lto.conf b/3PARTY/3party/cachyos-kernel-manager/makepkg-clang-without-lto.conf similarity index 100% rename from 3party/cachyos-kernel-manager/makepkg-clang-without-lto.conf rename to 3PARTY/3party/cachyos-kernel-manager/makepkg-clang-without-lto.conf diff --git a/3party/cachyos-kernel-manager/makepkg-clang.conf b/3PARTY/3party/cachyos-kernel-manager/makepkg-clang.conf similarity index 100% rename from 3party/cachyos-kernel-manager/makepkg-clang.conf rename to 3PARTY/3party/cachyos-kernel-manager/makepkg-clang.conf diff --git a/3party/cachyos-kernel-manager/makepkg-gcc-without-lto.conf b/3PARTY/3party/cachyos-kernel-manager/makepkg-gcc-without-lto.conf similarity index 100% rename from 3party/cachyos-kernel-manager/makepkg-gcc-without-lto.conf rename to 3PARTY/3party/cachyos-kernel-manager/makepkg-gcc-without-lto.conf diff --git a/3party/cachyos-kernel-manager/makepkg-gcc.conf b/3PARTY/3party/cachyos-kernel-manager/makepkg-gcc.conf similarity index 100% rename from 3party/cachyos-kernel-manager/makepkg-gcc.conf rename to 3PARTY/3party/cachyos-kernel-manager/makepkg-gcc.conf diff --git a/3party/cachyos-packageinstaller/.SRCINFO b/3PARTY/3party/cachyos-packageinstaller/.SRCINFO similarity index 100% rename from 3party/cachyos-packageinstaller/.SRCINFO rename to 3PARTY/3party/cachyos-packageinstaller/.SRCINFO diff --git a/3party/cachyos-packageinstaller/00_make.sh b/3PARTY/3party/cachyos-packageinstaller/00_make.sh similarity index 100% rename from 3party/cachyos-packageinstaller/00_make.sh rename to 3PARTY/3party/cachyos-packageinstaller/00_make.sh diff --git a/3party/cachyos-packageinstaller/01_sign.sh b/3PARTY/3party/cachyos-packageinstaller/01_sign.sh similarity index 100% rename from 3party/cachyos-packageinstaller/01_sign.sh rename to 3PARTY/3party/cachyos-packageinstaller/01_sign.sh diff --git a/3party/cachyos-packageinstaller/PKGBUILD b/3PARTY/3party/cachyos-packageinstaller/PKGBUILD similarity index 100% rename from 3party/cachyos-packageinstaller/PKGBUILD rename to 3PARTY/3party/cachyos-packageinstaller/PKGBUILD diff --git a/3party/cachyos-sysctl-manager/00_make.sh b/3PARTY/3party/cachyos-sysctl-manager/00_make.sh similarity index 100% rename from 3party/cachyos-sysctl-manager/00_make.sh rename to 3PARTY/3party/cachyos-sysctl-manager/00_make.sh diff --git a/3party/cachyos-sysctl-manager/01_sign.sh b/3PARTY/3party/cachyos-sysctl-manager/01_sign.sh similarity index 100% rename from 3party/cachyos-sysctl-manager/01_sign.sh rename to 3PARTY/3party/cachyos-sysctl-manager/01_sign.sh diff --git a/3party/cachyos-sysctl-manager/PKGBUILD b/3PARTY/3party/cachyos-sysctl-manager/PKGBUILD similarity index 100% rename from 3party/cachyos-sysctl-manager/PKGBUILD rename to 3PARTY/3party/cachyos-sysctl-manager/PKGBUILD diff --git a/3PARTY/3party/clean.sh b/3PARTY/3party/clean.sh new file mode 100755 index 0000000..98171b5 --- /dev/null +++ b/3PARTY/3party/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/3party/freeoffice b/3PARTY/3party/freeoffice similarity index 100% rename from 3party/freeoffice rename to 3PARTY/3party/freeoffice diff --git a/3party/ftl-sdk b/3PARTY/3party/ftl-sdk similarity index 100% rename from 3party/ftl-sdk rename to 3PARTY/3party/ftl-sdk diff --git a/3party/git_pull.sh b/3PARTY/3party/git_pull.sh similarity index 100% rename from 3party/git_pull.sh rename to 3PARTY/3party/git_pull.sh diff --git a/3party/gstreamer-meta b/3PARTY/3party/gstreamer-meta similarity index 100% rename from 3party/gstreamer-meta rename to 3PARTY/3party/gstreamer-meta diff --git a/3party/icu69-bin b/3PARTY/3party/icu69-bin similarity index 100% rename from 3party/icu69-bin rename to 3PARTY/3party/icu69-bin diff --git a/3party/input-devices-support b/3PARTY/3party/input-devices-support similarity index 100% rename from 3party/input-devices-support rename to 3PARTY/3party/input-devices-support diff --git a/3party/librist b/3PARTY/3party/librist similarity index 100% rename from 3party/librist rename to 3PARTY/3party/librist diff --git a/3party/mailspring b/3PARTY/3party/mailspring similarity index 100% rename from 3party/mailspring rename to 3PARTY/3party/mailspring diff --git a/3PARTY/3party/make.sh b/3PARTY/3party/make.sh new file mode 100755 index 0000000..aaa1055 --- /dev/null +++ b/3PARTY/3party/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/3party/media-downloader b/3PARTY/3party/media-downloader similarity index 100% rename from 3party/media-downloader rename to 3PARTY/3party/media-downloader diff --git a/3PARTY/3party/move_to_repo.sh b/3PARTY/3party/move_to_repo.sh new file mode 100755 index 0000000..6c07b49 --- /dev/null +++ b/3PARTY/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 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/3party/noto-color-emoji-fontconfig b/3PARTY/3party/noto-color-emoji-fontconfig similarity index 100% rename from 3party/noto-color-emoji-fontconfig rename to 3PARTY/3party/noto-color-emoji-fontconfig diff --git a/3party/pipewire-support b/3PARTY/3party/pipewire-support similarity index 100% rename from 3party/pipewire-support rename to 3PARTY/3party/pipewire-support diff --git a/3party/portainer-bin b/3PARTY/3party/portainer-bin similarity index 100% rename from 3party/portainer-bin rename to 3PARTY/3party/portainer-bin diff --git a/3party/printer-support b/3PARTY/3party/printer-support similarity index 100% rename from 3party/printer-support rename to 3PARTY/3party/printer-support diff --git a/3party/pwd.txt b/3PARTY/3party/pwd.txt similarity index 100% rename from 3party/pwd.txt rename to 3PARTY/3party/pwd.txt diff --git a/3PARTY/3party/python-flatbencode b/3PARTY/3party/python-flatbencode new file mode 160000 index 0000000..d1c4cc3 --- /dev/null +++ b/3PARTY/3party/python-flatbencode @@ -0,0 +1 @@ +Subproject commit d1c4cc3366706e1e28b9a056d368d65c34534759 diff --git a/3PARTY/3party/python-torf b/3PARTY/3party/python-torf new file mode 160000 index 0000000..a08473d --- /dev/null +++ b/3PARTY/3party/python-torf @@ -0,0 +1 @@ +Subproject commit a08473d3ee2a9a4fe0ac45dab6b78c4afafb6a55 diff --git a/3party/samba-support b/3PARTY/3party/samba-support similarity index 100% rename from 3party/samba-support rename to 3PARTY/3party/samba-support diff --git a/3party/scanner-support b/3PARTY/3party/scanner-support similarity index 100% rename from 3party/scanner-support rename to 3PARTY/3party/scanner-support diff --git a/3PARTY/3party/torf-cli b/3PARTY/3party/torf-cli new file mode 160000 index 0000000..e153426 --- /dev/null +++ b/3PARTY/3party/torf-cli @@ -0,0 +1 @@ +Subproject commit e153426ccb8206f4a65373b11dd40ed3a7bba41e diff --git a/3party/ttf-ms-fonts b/3PARTY/3party/ttf-ms-fonts similarity index 100% rename from 3party/ttf-ms-fonts rename to 3PARTY/3party/ttf-ms-fonts diff --git a/3party/ttf-twemoji b/3PARTY/3party/ttf-twemoji similarity index 100% rename from 3party/ttf-twemoji rename to 3PARTY/3party/ttf-twemoji diff --git a/3party/ventoy-bin b/3PARTY/3party/ventoy-bin similarity index 100% rename from 3party/ventoy-bin rename to 3PARTY/3party/ventoy-bin diff --git a/3PARTY/3party/yandex-disk b/3PARTY/3party/yandex-disk new file mode 160000 index 0000000..aab250f --- /dev/null +++ b/3PARTY/3party/yandex-disk @@ -0,0 +1 @@ +Subproject commit aab250f513ab024d4d535a34959f37b425a212dc diff --git a/3party/yandex-disk-indicator b/3PARTY/3party/yandex-disk-indicator similarity index 100% rename from 3party/yandex-disk-indicator rename to 3PARTY/3party/yandex-disk-indicator diff --git a/One_per_month/linux-xanmod-anbox b/3PARTY/One_per_month/linux-xanmod-anbox similarity index 100% rename from One_per_month/linux-xanmod-anbox rename to 3PARTY/One_per_month/linux-xanmod-anbox diff --git a/One_per_month/make.sh b/3PARTY/One_per_month/make.sh similarity index 100% rename from One_per_month/make.sh rename to 3PARTY/One_per_month/make.sh diff --git a/One_per_month/pwd.txt b/3PARTY/One_per_month/pwd.txt similarity index 100% rename from One_per_month/pwd.txt rename to 3PARTY/One_per_month/pwd.txt diff --git a/3PARTY/catppuccin/catppuccin-cursors-frappe b/3PARTY/catppuccin/catppuccin-cursors-frappe new file mode 160000 index 0000000..e6565e3 --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-cursors-frappe @@ -0,0 +1 @@ +Subproject commit e6565e36a41710bca8fb536f041d274cf4ce2d94 diff --git a/3PARTY/catppuccin/catppuccin-cursors-latte b/3PARTY/catppuccin/catppuccin-cursors-latte new file mode 160000 index 0000000..41edc14 --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-cursors-latte @@ -0,0 +1 @@ +Subproject commit 41edc14c995eb499caa8c224052ab832fa596946 diff --git a/3PARTY/catppuccin/catppuccin-cursors-macchiato b/3PARTY/catppuccin/catppuccin-cursors-macchiato new file mode 160000 index 0000000..12efbdc --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-cursors-macchiato @@ -0,0 +1 @@ +Subproject commit 12efbdc4f9372c92fe39b9d56f6a5c88ddd31872 diff --git a/3PARTY/catppuccin/catppuccin-cursors-mocha b/3PARTY/catppuccin/catppuccin-cursors-mocha new file mode 160000 index 0000000..a89b326 --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-cursors-mocha @@ -0,0 +1 @@ +Subproject commit a89b3266d20cc438851e8c6503f2222ad0cf0d45 diff --git a/3PARTY/catppuccin/catppuccin-gtk-theme-frappe b/3PARTY/catppuccin/catppuccin-gtk-theme-frappe new file mode 160000 index 0000000..7a2851d --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-gtk-theme-frappe @@ -0,0 +1 @@ +Subproject commit 7a2851d70445038a7259db8609080a97bf798b0d diff --git a/3PARTY/catppuccin/catppuccin-gtk-theme-latte b/3PARTY/catppuccin/catppuccin-gtk-theme-latte new file mode 160000 index 0000000..358b885 --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-gtk-theme-latte @@ -0,0 +1 @@ +Subproject commit 358b8851759603ac465e3ed90c2f8d0f7c0021aa diff --git a/3PARTY/catppuccin/catppuccin-gtk-theme-macchiato b/3PARTY/catppuccin/catppuccin-gtk-theme-macchiato new file mode 160000 index 0000000..0c765bd --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-gtk-theme-macchiato @@ -0,0 +1 @@ +Subproject commit 0c765bdc1981d1ff755a9bada990712978afdd1b diff --git a/3PARTY/catppuccin/catppuccin-gtk-theme-mocha b/3PARTY/catppuccin/catppuccin-gtk-theme-mocha new file mode 160000 index 0000000..b7e5b95 --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-gtk-theme-mocha @@ -0,0 +1 @@ +Subproject commit b7e5b95e533462701516ea592ec86da099f7f349 diff --git a/3PARTY/catppuccin/catppuccin-konsole-theme b/3PARTY/catppuccin/catppuccin-konsole-theme new file mode 160000 index 0000000..dea74fb --- /dev/null +++ b/3PARTY/catppuccin/catppuccin-konsole-theme @@ -0,0 +1 @@ +Subproject commit dea74fb5b2a9850c8a35dad830b149575ade6daa diff --git a/3PARTY/catppuccin/clean.sh b/3PARTY/catppuccin/clean.sh new file mode 100755 index 0000000..98171b5 --- /dev/null +++ b/3PARTY/catppuccin/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/git_pull.sh b/3PARTY/catppuccin/git_pull.sh similarity index 100% rename from Core/git_pull.sh rename to 3PARTY/catppuccin/git_pull.sh diff --git a/3PARTY/catppuccin/kvantum-theme-catppuccin b/3PARTY/catppuccin/kvantum-theme-catppuccin new file mode 160000 index 0000000..62aa645 --- /dev/null +++ b/3PARTY/catppuccin/kvantum-theme-catppuccin @@ -0,0 +1 @@ +Subproject commit 62aa64569cd681ebdf67d47c5ecd1501ace13f99 diff --git a/3PARTY/catppuccin/make.sh b/3PARTY/catppuccin/make.sh new file mode 100755 index 0000000..aaa1055 --- /dev/null +++ b/3PARTY/catppuccin/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/3PARTY/catppuccin/move_to_repo.sh b/3PARTY/catppuccin/move_to_repo.sh new file mode 100755 index 0000000..6c07b49 --- /dev/null +++ b/3PARTY/catppuccin/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-3party/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/3PARTY/catppuccin/plasma5-theme-catppuccin b/3PARTY/catppuccin/plasma5-theme-catppuccin new file mode 160000 index 0000000..50c577f --- /dev/null +++ b/3PARTY/catppuccin/plasma5-theme-catppuccin @@ -0,0 +1 @@ +Subproject commit 50c577f7aa554dfdad963b4b52e2b796915721f5 diff --git a/3PARTY/catppuccin/plasma5-theme-catppuccin-git b/3PARTY/catppuccin/plasma5-theme-catppuccin-git new file mode 160000 index 0000000..8941169 --- /dev/null +++ b/3PARTY/catppuccin/plasma5-theme-catppuccin-git @@ -0,0 +1 @@ +Subproject commit 8941169305e87e154cdde88e278ec3db2f75ec1b diff --git a/3PARTY/catppuccin/plymouth-theme-catppuccin b/3PARTY/catppuccin/plymouth-theme-catppuccin new file mode 160000 index 0000000..0e9d8b9 --- /dev/null +++ b/3PARTY/catppuccin/plymouth-theme-catppuccin @@ -0,0 +1 @@ +Subproject commit 0e9d8b94c03c11fae0a063ec547d0e147e815470 diff --git a/3PARTY/catppuccin/pwd.txt b/3PARTY/catppuccin/pwd.txt new file mode 100644 index 0000000..2447857 --- /dev/null +++ b/3PARTY/catppuccin/pwd.txt @@ -0,0 +1 @@ +/data/github/active/Melawy/PKGBUILD/3PARTY/catppuccin \ No newline at end of file diff --git a/3PARTY/catppuccin/refind-theme-catppuccin b/3PARTY/catppuccin/refind-theme-catppuccin new file mode 160000 index 0000000..da7c291 --- /dev/null +++ b/3PARTY/catppuccin/refind-theme-catppuccin @@ -0,0 +1 @@ +Subproject commit da7c2914ba0df24a64d2bc5d5b2dff875f8a3ed1 diff --git a/3PARTY/catppuccin/sddm-theme-catppuccin b/3PARTY/catppuccin/sddm-theme-catppuccin new file mode 160000 index 0000000..e51c063 --- /dev/null +++ b/3PARTY/catppuccin/sddm-theme-catppuccin @@ -0,0 +1 @@ +Subproject commit e51c063eafe5a39ef09bc653133089968e10ef90 diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/FETCH_HEAD b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/FETCH_HEAD deleted file mode 100644 index b20cd28..0000000 --- a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/FETCH_HEAD +++ /dev/null @@ -1,2 +0,0 @@ -1ff6c66ab438fe1df097ab2705033ddb4fe373aa not-for-merge branch 'develop' of https://github.com/cachyos/sysctl-manager -3bd74be07bbbfc38e8683f8a6bace4e30dd9a57c not-for-merge tag 'v1.0.0' of https://github.com/cachyos/sysctl-manager diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/HEAD b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/HEAD deleted file mode 100644 index 7ee7e4f..0000000 --- a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/develop diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/config b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/config deleted file mode 100644 index 09711a5..0000000 --- a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/config +++ /dev/null @@ -1,8 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = true -[remote "origin"] - url = https://github.com/cachyos/sysctl-manager.git - fetch = +refs/*:refs/* - mirror = true diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.idx b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.idx deleted file mode 100644 index 5dd321e..0000000 Binary files a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.idx and /dev/null differ diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.pack b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.pack deleted file mode 100644 index 321168c..0000000 Binary files a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.pack and /dev/null differ diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.rev b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.rev deleted file mode 100644 index 0ddf5bb..0000000 Binary files a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/objects/pack/pack-7dbfc73c2471320ac6134c7232d88478e1783046.rev and /dev/null differ diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/packed-refs b/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/packed-refs deleted file mode 100644 index 805b96b..0000000 --- a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/packed-refs +++ /dev/null @@ -1,3 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -1ff6c66ab438fe1df097ab2705033ddb4fe373aa refs/heads/develop -3bd74be07bbbfc38e8683f8a6bace4e30dd9a57c refs/tags/v1.0.0 diff --git a/3party/make.sh b/3party/make.sh deleted file mode 100755 index f505b7f..0000000 --- a/3party/make.sh +++ /dev/null @@ -1,71 +0,0 @@ -#!/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 - -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/move_to_repo.sh b/3party/move_to_repo.sh deleted file mode 100755 index 39a3a88..0000000 --- a/3party/move_to_repo.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/Archlinux/ccache b/Archlinux/ccache new file mode 160000 index 0000000..73fc634 --- /dev/null +++ b/Archlinux/ccache @@ -0,0 +1 @@ +Subproject commit 73fc6344a9f2f9b6d19ce66e81d4b9349bf5640a diff --git a/Archlinux/clean.sh b/Archlinux/clean.sh new file mode 100755 index 0000000..bee2c06 --- /dev/null +++ b/Archlinux/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-archlinux/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Archlinux/clone.sh b/Archlinux/clone.sh new file mode 100755 index 0000000..ff8eac3 --- /dev/null +++ b/Archlinux/clone.sh @@ -0,0 +1,23 @@ +#!/bin/bash + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +packages=$(cat packages.txt) + +for package in ${packages} +do + if [ -d "$package" ]; then + cd "$CWD/$package" + git pull + cd "$CWD" + else + access_location=$(curl -ILs https://gitlab.archlinux.org/archlinux/packaging/packages/${package} | grep location | awk '{print $2}') + if [[ "$access_location" == *"gitlab.archlinux.org/users"* ]]; then + echo "" + else + git clone "https://gitlab.archlinux.org/archlinux/packaging/packages/${package}.git" + fi + fi +done diff --git a/Archlinux/fastfetch b/Archlinux/fastfetch new file mode 160000 index 0000000..fd4832e --- /dev/null +++ b/Archlinux/fastfetch @@ -0,0 +1 @@ +Subproject commit fd4832e2f737ccd5116cccbde1abe6c3660c1b30 diff --git a/Archlinux/kdsoap-ws-discovery-client b/Archlinux/kdsoap-ws-discovery-client new file mode 160000 index 0000000..2c55102 --- /dev/null +++ b/Archlinux/kdsoap-ws-discovery-client @@ -0,0 +1 @@ +Subproject commit 2c551023e316f33f68e527584bf1d944dd095f36 diff --git a/Archlinux/make.sh b/Archlinux/make.sh new file mode 100755 index 0000000..25156f0 --- /dev/null +++ b/Archlinux/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-archlinux/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.xz$" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Archlinux/move_to_repo.sh b/Archlinux/move_to_repo.sh new file mode 100755 index 0000000..03a6c9a --- /dev/null +++ b/Archlinux/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-archlinux/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Archlinux/packages.txt b/Archlinux/packages.txt new file mode 100644 index 0000000..9d89248 --- /dev/null +++ b/Archlinux/packages.txt @@ -0,0 +1,6 @@ +ccache +fastfetch +ftl-sdk +kdsoap-ws-discovery-client +profile-sync-daemon +python diff --git a/Archlinux/profile-sync-daemon b/Archlinux/profile-sync-daemon new file mode 160000 index 0000000..2f54889 --- /dev/null +++ b/Archlinux/profile-sync-daemon @@ -0,0 +1 @@ +Subproject commit 2f548897fbc8e35a431960ae5027641991ba8aee diff --git a/Archlinux/pwd.txt b/Archlinux/pwd.txt new file mode 100644 index 0000000..ded4e47 --- /dev/null +++ b/Archlinux/pwd.txt @@ -0,0 +1 @@ +/data/github/active/Melawy/PKGBUILD/Archlinux \ No newline at end of file diff --git a/Archlinux/python b/Archlinux/python new file mode 160000 index 0000000..e99f785 --- /dev/null +++ b/Archlinux/python @@ -0,0 +1 @@ +Subproject commit e99f7856656790318d9735b4d9a1d92bff845f41 diff --git a/Archlinux/python312 b/Archlinux/python312 new file mode 160000 index 0000000..6615298 --- /dev/null +++ b/Archlinux/python312 @@ -0,0 +1 @@ +Subproject commit 6615298c4ce167692722b43975cbf15d8208ccf4 diff --git a/Archlinux/sign.sh b/Archlinux/sign.sh new file mode 100755 index 0000000..592baf2 --- /dev/null +++ b/Archlinux/sign.sh @@ -0,0 +1,68 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-archlinux/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.xz$" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in $pkg_file + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/ananicy-cpp b/CORE/Core/ananicy-cpp similarity index 100% rename from Core/ananicy-cpp rename to CORE/Core/ananicy-cpp diff --git a/Core/ananicy-rules b/CORE/Core/ananicy-rules similarity index 100% rename from Core/ananicy-rules rename to CORE/Core/ananicy-rules diff --git a/Core/appimagelauncher b/CORE/Core/appimagelauncher similarity index 100% rename from Core/appimagelauncher rename to CORE/Core/appimagelauncher diff --git a/Core/bpftune b/CORE/Core/bpftune similarity index 100% rename from Core/bpftune rename to CORE/Core/bpftune diff --git a/Core/btrfs-assistant b/CORE/Core/btrfs-assistant similarity index 100% rename from Core/btrfs-assistant rename to CORE/Core/btrfs-assistant diff --git a/Core/btrfs-snapshots b/CORE/Core/btrfs-snapshots similarity index 100% rename from Core/btrfs-snapshots rename to CORE/Core/btrfs-snapshots diff --git a/Core/btrfsmaintenance b/CORE/Core/btrfsmaintenance similarity index 100% rename from Core/btrfsmaintenance rename to CORE/Core/btrfsmaintenance diff --git a/Core/chwd/00_make.sh b/CORE/Core/chwd/00_make.sh similarity index 100% rename from Core/chwd/00_make.sh rename to CORE/Core/chwd/00_make.sh diff --git a/Core/chwd/01_sign.sh b/CORE/Core/chwd/01_sign.sh similarity index 100% rename from Core/chwd/01_sign.sh rename to CORE/Core/chwd/01_sign.sh diff --git a/Core/chwd/PKGBUILD b/CORE/Core/chwd/PKGBUILD similarity index 100% rename from Core/chwd/PKGBUILD rename to CORE/Core/chwd/PKGBUILD diff --git a/Core/chwd/chwd-db/HEAD b/CORE/Core/chwd/chwd-db/HEAD similarity index 100% rename from Core/chwd/chwd-db/HEAD rename to CORE/Core/chwd/chwd-db/HEAD diff --git a/Core/chwd/chwd-db/config b/CORE/Core/chwd/chwd-db/config similarity index 100% rename from Core/chwd/chwd-db/config rename to CORE/Core/chwd/chwd-db/config diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/description b/CORE/Core/chwd/chwd-db/description similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/description rename to CORE/Core/chwd/chwd-db/description diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/applypatch-msg.sample b/CORE/Core/chwd/chwd-db/hooks/applypatch-msg.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/applypatch-msg.sample rename to CORE/Core/chwd/chwd-db/hooks/applypatch-msg.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/commit-msg.sample b/CORE/Core/chwd/chwd-db/hooks/commit-msg.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/commit-msg.sample rename to CORE/Core/chwd/chwd-db/hooks/commit-msg.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/fsmonitor-watchman.sample b/CORE/Core/chwd/chwd-db/hooks/fsmonitor-watchman.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/fsmonitor-watchman.sample rename to CORE/Core/chwd/chwd-db/hooks/fsmonitor-watchman.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/post-update.sample b/CORE/Core/chwd/chwd-db/hooks/post-update.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/post-update.sample rename to CORE/Core/chwd/chwd-db/hooks/post-update.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-applypatch.sample b/CORE/Core/chwd/chwd-db/hooks/pre-applypatch.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-applypatch.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-applypatch.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-commit.sample b/CORE/Core/chwd/chwd-db/hooks/pre-commit.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-commit.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-commit.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-merge-commit.sample b/CORE/Core/chwd/chwd-db/hooks/pre-merge-commit.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-merge-commit.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-merge-commit.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-push.sample b/CORE/Core/chwd/chwd-db/hooks/pre-push.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-push.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-push.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-rebase.sample b/CORE/Core/chwd/chwd-db/hooks/pre-rebase.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-rebase.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-rebase.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-receive.sample b/CORE/Core/chwd/chwd-db/hooks/pre-receive.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/pre-receive.sample rename to CORE/Core/chwd/chwd-db/hooks/pre-receive.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/prepare-commit-msg.sample b/CORE/Core/chwd/chwd-db/hooks/prepare-commit-msg.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/prepare-commit-msg.sample rename to CORE/Core/chwd/chwd-db/hooks/prepare-commit-msg.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/push-to-checkout.sample b/CORE/Core/chwd/chwd-db/hooks/push-to-checkout.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/push-to-checkout.sample rename to CORE/Core/chwd/chwd-db/hooks/push-to-checkout.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/sendemail-validate.sample b/CORE/Core/chwd/chwd-db/hooks/sendemail-validate.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/sendemail-validate.sample rename to CORE/Core/chwd/chwd-db/hooks/sendemail-validate.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/update.sample b/CORE/Core/chwd/chwd-db/hooks/update.sample similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/hooks/update.sample rename to CORE/Core/chwd/chwd-db/hooks/update.sample diff --git a/3party/cachyos-sysctl-manager/cachyos-sysctl-manager/info/exclude b/CORE/Core/chwd/chwd-db/info/exclude similarity index 100% rename from 3party/cachyos-sysctl-manager/cachyos-sysctl-manager/info/exclude rename to CORE/Core/chwd/chwd-db/info/exclude diff --git a/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.idx b/CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.idx similarity index 100% rename from Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.idx rename to CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.idx diff --git a/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.pack b/CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.pack similarity index 100% rename from Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.pack rename to CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.pack diff --git a/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.rev b/CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.rev similarity index 100% rename from Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.rev rename to CORE/Core/chwd/chwd-db/objects/pack/pack-ac8120520ed6fab2b58286ad2a3f02cc5d8585be.rev diff --git a/Core/chwd/chwd-db/packed-refs b/CORE/Core/chwd/chwd-db/packed-refs similarity index 100% rename from Core/chwd/chwd-db/packed-refs rename to CORE/Core/chwd/chwd-db/packed-refs diff --git a/CORE/Core/clean.sh b/CORE/Core/clean.sh new file mode 100755 index 0000000..6da9fdd --- /dev/null +++ b/CORE/Core/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-core/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/codelldb b/CORE/Core/codelldb similarity index 100% rename from Core/codelldb rename to CORE/Core/codelldb diff --git a/Core/downgrade b/CORE/Core/downgrade similarity index 100% rename from Core/downgrade rename to CORE/Core/downgrade diff --git a/Core/find-the-command b/CORE/Core/find-the-command similarity index 100% rename from Core/find-the-command rename to CORE/Core/find-the-command diff --git a/CORE/Core/git_pull.sh b/CORE/Core/git_pull.sh new file mode 100755 index 0000000..fd93eca --- /dev/null +++ b/CORE/Core/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/Core/grub-dracut/.gitignore b/CORE/Core/grub-dracut/.gitignore similarity index 100% rename from Core/grub-dracut/.gitignore rename to CORE/Core/grub-dracut/.gitignore diff --git a/Core/grub-dracut/00_make.sh b/CORE/Core/grub-dracut/00_make.sh similarity index 100% rename from Core/grub-dracut/00_make.sh rename to CORE/Core/grub-dracut/00_make.sh diff --git a/Core/grub-dracut/01_sign.sh b/CORE/Core/grub-dracut/01_sign.sh similarity index 100% rename from Core/grub-dracut/01_sign.sh rename to CORE/Core/grub-dracut/01_sign.sh diff --git a/Core/grub-dracut/PKGBUILD b/CORE/Core/grub-dracut/PKGBUILD similarity index 100% rename from Core/grub-dracut/PKGBUILD rename to CORE/Core/grub-dracut/PKGBUILD diff --git a/Core/irqbalance b/CORE/Core/irqbalance similarity index 100% rename from Core/irqbalance rename to CORE/Core/irqbalance diff --git a/Core/libpamac-full b/CORE/Core/libpamac-full similarity index 100% rename from Core/libpamac-full rename to CORE/Core/libpamac-full diff --git a/CORE/Core/make.sh b/CORE/Core/make.sh new file mode 100755 index 0000000..024666b --- /dev/null +++ b/CORE/Core/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-core/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/Core/move_to_repo.sh b/CORE/Core/move_to_repo.sh new file mode 100755 index 0000000..1e3d2f3 --- /dev/null +++ b/CORE/Core/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy-core/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Core/ocs-url b/CORE/Core/ocs-url similarity index 100% rename from Core/ocs-url rename to CORE/Core/ocs-url diff --git a/Core/pace b/CORE/Core/pace similarity index 100% rename from Core/pace rename to CORE/Core/pace diff --git a/Core/paclast b/CORE/Core/paclast similarity index 100% rename from Core/paclast rename to CORE/Core/paclast diff --git a/Core/pamac-all b/CORE/Core/pamac-all similarity index 100% rename from Core/pamac-all rename to CORE/Core/pamac-all diff --git a/Core/pamac-cli b/CORE/Core/pamac-cli similarity index 100% rename from Core/pamac-cli rename to CORE/Core/pamac-cli diff --git a/Core/paru/.SRCINFO b/CORE/Core/paru/.SRCINFO similarity index 100% rename from Core/paru/.SRCINFO rename to CORE/Core/paru/.SRCINFO diff --git a/Core/paru/.gitignore b/CORE/Core/paru/.gitignore similarity index 100% rename from Core/paru/.gitignore rename to CORE/Core/paru/.gitignore diff --git a/Core/paru/00_make.sh b/CORE/Core/paru/00_make.sh similarity index 100% rename from Core/paru/00_make.sh rename to CORE/Core/paru/00_make.sh diff --git a/Core/paru/01_sign.sh b/CORE/Core/paru/01_sign.sh similarity index 100% rename from Core/paru/01_sign.sh rename to CORE/Core/paru/01_sign.sh diff --git a/Core/paru/PKGBUILD b/CORE/Core/paru/PKGBUILD similarity index 100% rename from Core/paru/PKGBUILD rename to CORE/Core/paru/PKGBUILD diff --git a/Core/performance-tweaks/00_make.sh b/CORE/Core/performance-tweaks/00_make.sh similarity index 100% rename from Core/performance-tweaks/00_make.sh rename to CORE/Core/performance-tweaks/00_make.sh diff --git a/Core/performance-tweaks/01_sign.sh b/CORE/Core/performance-tweaks/01_sign.sh similarity index 100% rename from Core/performance-tweaks/01_sign.sh rename to CORE/Core/performance-tweaks/01_sign.sh diff --git a/Core/performance-tweaks/PKGBUILD b/CORE/Core/performance-tweaks/PKGBUILD similarity index 100% rename from Core/performance-tweaks/PKGBUILD rename to CORE/Core/performance-tweaks/PKGBUILD diff --git a/Core/performance-tweaks/performance-tweaks.install b/CORE/Core/performance-tweaks/performance-tweaks.install similarity index 100% rename from Core/performance-tweaks/performance-tweaks.install rename to CORE/Core/performance-tweaks/performance-tweaks.install diff --git a/Core/plymouth b/CORE/Core/plymouth similarity index 100% rename from Core/plymouth rename to CORE/Core/plymouth diff --git a/CORE/Core/plymouth-kcm b/CORE/Core/plymouth-kcm new file mode 160000 index 0000000..6bd724e --- /dev/null +++ b/CORE/Core/plymouth-kcm @@ -0,0 +1 @@ +Subproject commit 6bd724e36a2217933e8f311293768a651b22530c diff --git a/Core/powersave-tweaks/00_make.sh b/CORE/Core/powersave-tweaks/00_make.sh similarity index 100% rename from Core/powersave-tweaks/00_make.sh rename to CORE/Core/powersave-tweaks/00_make.sh diff --git a/Core/powersave-tweaks/01_sign.sh b/CORE/Core/powersave-tweaks/01_sign.sh similarity index 100% rename from Core/powersave-tweaks/01_sign.sh rename to CORE/Core/powersave-tweaks/01_sign.sh diff --git a/Core/powersave-tweaks/PKGBUILD b/CORE/Core/powersave-tweaks/PKGBUILD similarity index 100% rename from Core/powersave-tweaks/PKGBUILD rename to CORE/Core/powersave-tweaks/PKGBUILD diff --git a/Core/preload b/CORE/Core/preload similarity index 100% rename from Core/preload rename to CORE/Core/preload diff --git a/Core/pwd.txt b/CORE/Core/pwd.txt similarity index 100% rename from Core/pwd.txt rename to CORE/Core/pwd.txt diff --git a/Core/ramroot-btrfs b/CORE/Core/ramroot-btrfs similarity index 100% rename from Core/ramroot-btrfs rename to CORE/Core/ramroot-btrfs diff --git a/Core/rate-mirrors b/CORE/Core/rate-mirrors similarity index 100% rename from Core/rate-mirrors rename to CORE/Core/rate-mirrors diff --git a/Core/systemd-boot-dracut/.SRCINFO b/CORE/Core/systemd-boot-dracut/.SRCINFO similarity index 100% rename from Core/systemd-boot-dracut/.SRCINFO rename to CORE/Core/systemd-boot-dracut/.SRCINFO diff --git a/Core/systemd-boot-dracut/.gitignore b/CORE/Core/systemd-boot-dracut/.gitignore similarity index 100% rename from Core/systemd-boot-dracut/.gitignore rename to CORE/Core/systemd-boot-dracut/.gitignore diff --git a/Core/systemd-boot-dracut/00_make.sh b/CORE/Core/systemd-boot-dracut/00_make.sh similarity index 100% rename from Core/systemd-boot-dracut/00_make.sh rename to CORE/Core/systemd-boot-dracut/00_make.sh diff --git a/Core/systemd-boot-dracut/01_sign.sh b/CORE/Core/systemd-boot-dracut/01_sign.sh similarity index 100% rename from Core/systemd-boot-dracut/01_sign.sh rename to CORE/Core/systemd-boot-dracut/01_sign.sh diff --git a/Core/systemd-boot-dracut/PKGBUILD b/CORE/Core/systemd-boot-dracut/PKGBUILD similarity index 100% rename from Core/systemd-boot-dracut/PKGBUILD rename to CORE/Core/systemd-boot-dracut/PKGBUILD diff --git a/Core/systemd-oomd-defaults b/CORE/Core/systemd-oomd-defaults similarity index 100% rename from Core/systemd-oomd-defaults rename to CORE/Core/systemd-oomd-defaults diff --git a/Core/timeshift b/CORE/Core/timeshift similarity index 100% rename from Core/timeshift rename to CORE/Core/timeshift diff --git a/Core/timeshift-autosnap b/CORE/Core/timeshift-autosnap similarity index 100% rename from Core/timeshift-autosnap rename to CORE/Core/timeshift-autosnap diff --git a/Core/topgrade b/CORE/Core/topgrade similarity index 100% rename from Core/topgrade rename to CORE/Core/topgrade diff --git a/Core/uksmd b/CORE/Core/uksmd similarity index 100% rename from Core/uksmd rename to CORE/Core/uksmd diff --git a/Core/uksmdstats b/CORE/Core/uksmdstats similarity index 100% rename from Core/uksmdstats rename to CORE/Core/uksmdstats diff --git a/Core/yay b/CORE/Core/yay similarity index 100% rename from Core/yay rename to CORE/Core/yay diff --git a/Core/chwd/chwd/HEAD b/Core/chwd/chwd/HEAD deleted file mode 100644 index cb089cd..0000000 --- a/Core/chwd/chwd/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/master diff --git a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.idx b/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.idx deleted file mode 100644 index 6b69e14..0000000 Binary files a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.idx and /dev/null differ diff --git a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.pack b/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.pack deleted file mode 100644 index e6fbe59..0000000 Binary files a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.pack and /dev/null differ diff --git a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.rev b/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.rev deleted file mode 100644 index 2cb3b80..0000000 Binary files a/Core/chwd/chwd/objects/pack/pack-20dff999373b4ab79759b08beef9ee694b47257c.rev and /dev/null differ diff --git a/Core/chwd/chwd/packed-refs b/Core/chwd/chwd/packed-refs deleted file mode 100644 index 319049f..0000000 --- a/Core/chwd/chwd/packed-refs +++ /dev/null @@ -1,61 +0,0 @@ -# pack-refs with: peeled fully-peeled sorted -e8b3e0f39b6338c8e2298434f16ba966e8d7cb1a refs/heads/master -d68867a9f02dc18d3a4634342510b34e27980311 refs/pull/1/head -8b663b5acc00d1d61312c8abe9de9964ed3b1c22 refs/pull/10/head -6b5d178324611676434da2cb947242758107c60c refs/pull/11/head -5ff6fe8637a95732a06bbc8b864b0f7108983d8b refs/pull/12/head -de80b6fc855819543284f99d2977b360eaf9aedc refs/pull/13/head -45d27c4928499e0480d438eb6a1b8f853384d128 refs/pull/14/head -1dab5e79f8d1c778d6d3aa0b404ec7be0b4ea9ed refs/pull/15/head -e70966c1b93ef3df7e7f3b4ec8ff2f5a23475db4 refs/pull/16/head -5bab5a6cb5d13f7848a387f862fdd4fb301f9484 refs/pull/17/head -bede72273e748172d24cac0339f1d28a31c982e5 refs/pull/18/head -1e47ef190d7aac76a7053bb0a0aef24eebf2ddb3 refs/pull/19/head -7ea77cb395ae530b54d1a62c97b03d608aea0f53 refs/pull/2/head -99cb943dc7baaba5cbe85d572582e236d31e3003 refs/pull/20/head -e8d47b9d24b56e9afc717382f8759f00561def2d refs/pull/21/head -052ab7af26ec87ea93f0148081ea9b1cb003c6a3 refs/pull/22/head -cea7c7e2515d8d218830e429e0138cf787f74685 refs/pull/23/head -3abd39888c6d13a7cb1df7c6895bcfa81575eaa0 refs/pull/24/head -4372374cf4e0baaec793c9704095a2d6735db024 refs/pull/25/head -24436bb2d81d3dc2c1535b9763178b5feadc19eb refs/pull/26/head -1011e779f1d0bc2759d4395ca3c636de28404d35 refs/pull/27/head -0557a2474a5287d0366271e3f8a1ed863f013232 refs/pull/28/head -a98ee38cbbaeacfee5a1592ca75dc61f33027b7f refs/pull/29/head -9f5bbca6f7f1d9e5b6ae43d48ce3e1b4c7157a38 refs/pull/3/head -b93844fe62169df05fa41d4049a79d903b4317f8 refs/pull/30/head -dc7c9377378d6387827bbe5cffefe2418010297c refs/pull/31/head -f02d839db2147909c1f55967dbe24f567d4d867f refs/pull/32/head -72558d5ec17b6d04e8da2eb8f27970374b622548 refs/pull/33/head -350f8e92925b6ead7009e2bd819795f218b272a7 refs/pull/34/head -8f7936fdd43e8e95982a65bfeaf616206945a89e refs/pull/35/head -1c441c08aa40db0a58ca7a24757c66324459bdd6 refs/pull/36/head -24a3efbfaef451141da5f9699f6545a70c20586b refs/pull/37/head -84c372975271e621c2eef9734db1e0b92f1fc958 refs/pull/38/head -400a474d685ad20272d1dc24af0dddddd4f0847d refs/pull/39/head -b6501b32098a4101b68632f89b71df52f7a3fde0 refs/pull/4/head -7ed40153458612ad00fae5dc10e48b1221b6d00c refs/pull/40/head -f9dcfcfa6c5c20db83a0a97bce389fbcd21a2b61 refs/pull/41/head -31ae3bcf1d6b006fc25f4b37175b31b3f913ae3f refs/pull/42/head -d1140c9f361129d11c242db29f95ded5a5d0d299 refs/pull/43/head -c6333a510fcb05c4f56e2e6f9fdb9be9fded44d5 refs/pull/44/head -602f5386329c9a086e0c74d9daf80e940c08af21 refs/pull/45/head -811a5e7579805cb332544578ab8bdcd0348307ca refs/pull/46/head -734ba1e3110f336d8bef06364b052353f98e6535 refs/pull/47/head -2b3276d8131458d516c7788ab16c328a36b48b34 refs/pull/48/head -8ffaf980194fa12989d97d421c9b6433472d56a8 refs/pull/49/head -f6c79ccf2494e0def10081a76e7cac4662f9693b refs/pull/5/head -a365457f9445ba75c99f625ca9cd5a54faa3bd6f refs/pull/50/head -b7d5cec0b81c192a84340e8c7a34a2edcd398f06 refs/pull/51/head -d3c5f9704de630b4903c761095794a8ee7a391ff refs/pull/52/head -a3682f0564ae7ee89201172efe9806cabeee8cad refs/pull/53/head -05e1665df7a8599c9170ba3a6ebd13c7eab6a588 refs/pull/54/head -95bc5aea12efefcdde56e776cc9caa2834f63c5b refs/pull/55/head -103e06fdeb54b483e8ee645ab5a80f5890b3d0a8 refs/pull/56/head -8fe501f25c8b36ce3158a03c87364c50ff88e23c refs/pull/57/head -8dfbe597b93ed540311c75a0e3f11c08f1c31c80 refs/pull/58/head -298a32f4ee1be8034d67cf1fa9e2a527256f9814 refs/pull/59/head -bdbf484bd42f4c861758e9f123eafd0858130d7e refs/pull/6/head -68d3d35e637c4a55975ca067abdf8ddd73a7417d refs/pull/7/head -a74abf18ed4f893e66e31c5ee7e75d9fe2fb473b refs/pull/8/head -341d5733197efbd30dc267951f30dd6707ebdf29 refs/pull/9/head diff --git a/Core/make.sh b/Core/make.sh deleted file mode 100755 index 9ac17f8..0000000 --- a/Core/make.sh +++ /dev/null @@ -1,67 +0,0 @@ -#!/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-core/x86_64/" - -echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt - -CWD=$(cat pwd.txt) - -for package_dir in $(find . -mindepth 1 -maxdepth 1 -type d) -do - cd $CWD/$package_dir - git pull - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Core/move_to_repo.sh b/Core/move_to_repo.sh deleted file mode 100755 index 7b39cc2..0000000 --- a/Core/move_to_repo.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy-core/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/DECORE/klassy b/DECORE/klassy new file mode 160000 index 0000000..9414782 --- /dev/null +++ b/DECORE/klassy @@ -0,0 +1 @@ +Subproject commit 9414782c23a1c50d2c67e16f9252fb6676f02653 diff --git a/DECORE/lightlyshaders b/DECORE/lightlyshaders new file mode 160000 index 0000000..ebc6901 --- /dev/null +++ b/DECORE/lightlyshaders @@ -0,0 +1 @@ +Subproject commit ebc690111da077176d2e7d5f3ca2ce7272548b55 diff --git a/DECORE/roundedsbe b/DECORE/roundedsbe new file mode 160000 index 0000000..e5dc8e2 --- /dev/null +++ b/DECORE/roundedsbe @@ -0,0 +1 @@ +Subproject commit e5dc8e26f8fb5d6a925db9ebae791ea7b7bbe8ca diff --git a/Design/Melawy/melawy-red-dark-cursors/PKGBUILD b/Design/Melawy/melawy-red-dark-cursors/PKGBUILD deleted file mode 100644 index 44aa53e..0000000 --- a/Design/Melawy/melawy-red-dark-cursors/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Valeria Fadeeva - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -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=() -optdepends=() -makedepends=("git") -options=("!strip") -backup=() -provides=("${pkgname}") -conflicts=("${pkgname}") -source=("git+$url.git") -sha256sums=("SKIP") -validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') - -# pkgver() { -# cd "$srcdir/Melawy-icon-theme" -# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -# } - -# 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() { - install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" -} diff --git a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh b/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh deleted file mode 100755 index 30b8975..0000000 --- a/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - -for i in *.pkg.tar.zst; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -for i in *.pkg.tar.xz; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD b/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD deleted file mode 100644 index 20fb9b6..0000000 --- a/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Valeria Fadeeva - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -pkgver=1.2 -pkgrel=1 -pkgdesc="$(head -n 2 README.md | tail -n 1)" -url="https://git.melawy.ru/Design/$_gitname" -arch=("any") -license=("AGPL3") -depends=() -optdepends=() -makedepends=("git") -options=("!strip") -backup=() -provides=("${pkgname}") -conflicts=("${pkgname}") -source=("git+$url.git") -sha256sums=("SKIP") -validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') - -# pkgver() { -# cd "$srcdir/Melawy-icon-theme" -# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -# } - -# 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() { - install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" -} diff --git a/Design/Melawy/melawy-red-light-cursors/00_make.sh b/Design/Melawy/melawy-red-light-cursors/00_make.sh deleted file mode 100755 index 30b8975..0000000 --- a/Design/Melawy/melawy-red-light-cursors/00_make.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - -for i in *.pkg.tar.zst; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -for i in *.pkg.tar.xz; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 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 deleted file mode 100755 index 30b8975..0000000 --- a/Design/Melawy/melawy-red-light-default-cursors/00_make.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - -for i in *.pkg.tar.zst; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -for i in *.pkg.tar.xz; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD b/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD deleted file mode 100644 index ad92916..0000000 --- a/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD +++ /dev/null @@ -1,40 +0,0 @@ -# Maintainer: Valeria Fadeeva - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -pkgver=1.1 -pkgrel=1 -pkgdesc="$(head -n 2 README.md | tail -n 1)" -url="https://git.melawy.ru/Design/$_gitname" -arch=("any") -license=("AGPL3") -depends=() -optdepends=() -makedepends=("git") -options=("!strip") -backup=() -provides=("${pkgname}") -conflicts=("${pkgname}") -source=("git+$url.git") -sha256sums=("SKIP") -validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') - -# pkgver() { -# cd "$srcdir/Melawy-icon-theme" -# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' -# } - -# 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() { - install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" -} 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 deleted file mode 100644 index 1ca2259..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -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/config b/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/config deleted file mode 100644 index a346d32..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/config +++ /dev/null @@ -1,8 +0,0 @@ -[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 deleted file mode 100644 index 498b267..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/description +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100755 index a5d7b84..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 deleted file mode 100755 index b58d118..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index 23e856f..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,174 +0,0 @@ -#!/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 deleted file mode 100755 index ec17ec1..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100755 index 4142082..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 deleted file mode 100755 index e144712..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/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 deleted file mode 100755 index 399eab1..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 deleted file mode 100755 index 4ce688d..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 deleted file mode 100755 index 6cbef5c..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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 deleted file mode 100755 index a1fd29e..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index 10fa14c..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 deleted file mode 100755 index af5a0c0..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/push-to-checkout.sample +++ /dev/null @@ -1,78 +0,0 @@ -#!/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 deleted file mode 100755 index c4d426b..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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 deleted file mode 100644 index a5196d1..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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 deleted file mode 100644 index 6e53d2b..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/14/bba9d5a0a0348540e1812bc46bd754296e4e73 and /dev/null 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 deleted file mode 100644 index 0a12890..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/1c0609be43add8f21d1be7fd0c15e66846cd48 and /dev/null 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 deleted file mode 100644 index 8748ecd..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/18/7626afff3f84265de9d607714ff750288623fe and /dev/null 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 deleted file mode 100644 index 7f993e7..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1a/8efba543041d16e7dce96629cf862849d21b6a and /dev/null 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 deleted file mode 100644 index ff77fce..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1b/990944ac160ee7824513d4652eaf7fd55a1ad2 and /dev/null 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 deleted file mode 100644 index 3a880fd..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/1c/fd84c00ff0fd965c6fcceeb60e908c30d7604a and /dev/null 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 deleted file mode 100644 index 44d59f5..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/27/7e7d0965a7c3165e7d6d43dd6791767d623081 and /dev/null 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 deleted file mode 100644 index f118823..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/2b/2ddc81ab982eca31f2850cc5e0e3472538c3ec and /dev/null 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 deleted file mode 100644 index f258a01..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5d/e3bf4303bf814cdfbf0ae3b84658703c8233bf and /dev/null 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 deleted file mode 100644 index 283b183..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/5f/68d3ec3c9bac86a3ce84a0f0c629c86f51bc41 and /dev/null 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 deleted file mode 100644 index 7f3895c..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/65/1c9a131aed13275c83fc9b2f8b1a634b6c5a0c and /dev/null 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 deleted file mode 100644 index 59ada07..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/6f/89099c6dd0d3639ca11f9fdd1c9c2050a93f2d and /dev/null 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 deleted file mode 100644 index 1d46997..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/76/22c3e9ad709308e638f6d014ccc9265d1b9921 and /dev/null 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 deleted file mode 100644 index ba96126..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/8c/e90db613cad5f2b2dd0037bf32fa18e3413029 and /dev/null 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 deleted file mode 100644 index fa42acf..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/b9/2ce73db50a13965ee280389e4df59d2fdf4235 and /dev/null 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 deleted file mode 100644 index e51b767..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e4/c9c5f7890111e3621d2653ddfc6384420b0444 and /dev/null 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 deleted file mode 100644 index f02bd43..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/e7/afdd6525fb131144f41607b8ac6708b2470c48 and /dev/null 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 deleted file mode 100644 index b0718c3..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/f9/341bfa3dedc4fbfe27d14471b7dac7bf8b77ba and /dev/null 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 deleted file mode 100644 index 96d4fbd..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.idx and /dev/null 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 deleted file mode 100644 index 7443942..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.pack and /dev/null 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 deleted file mode 100644 index 86044d7..0000000 Binary files a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/objects/pack/pack-601c4e45d731c2da162e77a9e216f9f7f427ef1d.rev and /dev/null 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 deleted file mode 100644 index bca8389..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index e0c8ac2..0000000 --- a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/refs/heads/main +++ /dev/null @@ -1 +0,0 @@ -f9341bfa3dedc4fbfe27d14471b7dac7bf8b77ba diff --git a/Design/make.sh b/Design/make.sh deleted file mode 100755 index 210d869..0000000 --- a/Design/make.sh +++ /dev/null @@ -1,39 +0,0 @@ -#!/bin/bash - -echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt - -CWD=$(cat pwd.txt) - -dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) - -for i in ${dir_list[@]} -do - path="$(dirname $i)" - full_path="$CWD/$path" - - echo "$full_path" - cd "$full_path" - - $(basename $full_path) - - git_dir=$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d) - if [ -d $git_dir ]; then - echo "rm $git_dir" -# rm "$git_dir" - fi - - make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) - if [ -f "$make_file" ]; then - echo "bash $make_file" - bash "$make_file" - else - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - fi - unset make_file - 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" diff --git a/Design/make_.sh b/Design/make_.sh deleted file mode 100755 index 4c9a004..0000000 --- a/Design/make_.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" - -echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt - -CWD=$(cat pwd.txt) - -for package_dir in $(find . -mindepth 1 -maxdepth 2 -type d) -do - cd $CWD/$package_dir - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Design/move_to_repo.sh b/Design/move_to_repo.sh deleted file mode 100755 index 488d7f5..0000000 --- a/Design/move_to_repo.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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/Installer/make.sh b/Installer/make.sh deleted file mode 100755 index f18c58b..0000000 --- a/Installer/make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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 - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Installer/melawy-calamares-config/.gitignore b/Installer/melawy-calamares-config/.gitignore deleted file mode 100644 index b48786f..0000000 --- a/Installer/melawy-calamares-config/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tar.* -pkg/ -src/ -/melawy-calamares-qt5 diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD b/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD deleted file mode 100644 index 19f20b8..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/FETCH_HEAD +++ /dev/null @@ -1 +0,0 @@ -6a3f0654b8e842ad89045551424b60d10c0267d9 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 deleted file mode 100644 index 015d909..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/HEAD +++ /dev/null @@ -1 +0,0 @@ -ref: refs/heads/calamares diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/config b/Installer/melawy-calamares-config/melawy-calamares-qt6/config deleted file mode 100644 index f20f659..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/config +++ /dev/null @@ -1,8 +0,0 @@ -[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 deleted file mode 100644 index 498b267..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/description +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100755 index a5d7b84..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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 deleted file mode 100755 index b58d118..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index 23e856f..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,174 +0,0 @@ -#!/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 deleted file mode 100755 index ec17ec1..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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 deleted file mode 100755 index 4142082..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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 deleted file mode 100755 index e144712..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/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 deleted file mode 100755 index 399eab1..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/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 deleted file mode 100755 index 4ce688d..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/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 deleted file mode 100755 index 6cbef5c..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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 deleted file mode 100755 index a1fd29e..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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 deleted file mode 100755 index 10fa14c..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/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 deleted file mode 100755 index af5a0c0..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/push-to-checkout.sample +++ /dev/null @@ -1,78 +0,0 @@ -#!/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 deleted file mode 100755 index c4d426b..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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 deleted file mode 100644 index a5196d1..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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-05d0ab15bc984b6e1a31c194216ac88e34bddc63.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.idx deleted file mode 100644 index fd39aff..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.pack deleted file mode 100644 index 0cc15b2..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.rev deleted file mode 100644 index 88ea92e..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-05d0ab15bc984b6e1a31c194216ac88e34bddc63.rev and /dev/null differ 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 deleted file mode 100644 index 2902812..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.idx and /dev/null 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 deleted file mode 100644 index 7ba88c0..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.pack and /dev/null 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 deleted file mode 100644 index bbd96d4..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0c0772cf999c5fca83f9cb93b3576a5b7c099dae.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.idx deleted file mode 100644 index b7a6100..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.pack deleted file mode 100644 index 6875fb5..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.rev deleted file mode 100644 index c24c36d..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-0dd9f83efa57120ad94b8fd8a2b95dcb02e8baca.rev and /dev/null 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 deleted file mode 100644 index ee393ac..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.idx and /dev/null 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 deleted file mode 100644 index 2c45253..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.pack and /dev/null 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 deleted file mode 100644 index 929b3e8..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-333a6ee39ff015359e701537c1ea960357f68ef1.rev and /dev/null 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 deleted file mode 100644 index 1332d42..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.idx and /dev/null 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 deleted file mode 100644 index 5dbbcfc..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.pack and /dev/null 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 deleted file mode 100644 index 188dc44..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4397d80c4541ddd4c37f156bef76a2bc1731b940.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.idx deleted file mode 100644 index 491bdd7..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.pack deleted file mode 100644 index 8e3e285..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.rev deleted file mode 100644 index ceeb780..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-4a3d2bbb054ecba4430265dd224e14e8afa36d47.rev and /dev/null 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 deleted file mode 100644 index 5ab052e..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.idx and /dev/null 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 deleted file mode 100644 index 5463be1..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.pack and /dev/null 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 deleted file mode 100644 index 247572e..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-68192b2895899cb53b406e753dc61696cc053993.rev and /dev/null 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 deleted file mode 100644 index 508dcb0..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.idx and /dev/null 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 deleted file mode 100644 index 036a0d3..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.pack and /dev/null 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 deleted file mode 100644 index 6ea1909..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-7436b1ae36206f761a1b5a8726187edfbb7ee5e0.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.idx deleted file mode 100644 index 2b435d0..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.pack deleted file mode 100644 index 1ddb124..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.rev deleted file mode 100644 index 3e2685b..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5939f9c582b50070d06749c582b4db329216818.rev and /dev/null 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 deleted file mode 100644 index 49934d5..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.idx and /dev/null 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 deleted file mode 100644 index 5bbf8ac..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.pack and /dev/null 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 deleted file mode 100644 index c665936..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-a5c3afed20dbb879e42f81dc736d7531cfbc1119.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.idx deleted file mode 100644 index 9789033..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.pack deleted file mode 100644 index 7c6d59c..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.rev deleted file mode 100644 index 85104a2..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-ca306bb07c2e4959c4f275c84af1691da051708a.rev and /dev/null 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 deleted file mode 100644 index 0c14181..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.idx and /dev/null 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 deleted file mode 100644 index 1437c58..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.pack and /dev/null 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 deleted file mode 100644 index 1ee65e9..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d223bd8bff6f8fee3b0ebe5b4eabb3a087865a3d.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.idx b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.idx deleted file mode 100644 index 831bf0a..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.idx and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.pack b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.pack deleted file mode 100644 index 66c2a2b..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.pack and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.rev b/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.rev deleted file mode 100644 index 780da67..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-d8851e5c79d1df17e57e355ddda319af368629f7.rev and /dev/null 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 deleted file mode 100644 index 678fe10..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.idx and /dev/null 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 deleted file mode 100644 index 0793309..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.pack and /dev/null 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 deleted file mode 100644 index 1a9ad49..0000000 Binary files a/Installer/melawy-calamares-config/melawy-calamares-qt6/objects/pack/pack-f3a651339342629d9551033b9ec10c18f492c8ba.rev and /dev/null differ diff --git a/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs b/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs deleted file mode 100644 index aadfc4e..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/packed-refs +++ /dev/null @@ -1,2 +0,0 @@ -# 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 deleted file mode 100644 index d9f1a48..0000000 --- a/Installer/melawy-calamares-config/melawy-calamares-qt6/refs/heads/calamares +++ /dev/null @@ -1 +0,0 @@ -6a3f0654b8e842ad89045551424b60d10c0267d9 diff --git a/Installer/melawy-calamares-qt5/.gitignore b/Installer/melawy-calamares-qt5/.gitignore deleted file mode 100644 index b48786f..0000000 --- a/Installer/melawy-calamares-qt5/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tar.* -pkg/ -src/ -/melawy-calamares-qt5 diff --git a/Installer/melawy-calamares-qt5/PKGBUILD b/Installer/melawy-calamares-qt5/PKGBUILD deleted file mode 100644 index 389f374..0000000 --- a/Installer/melawy-calamares-qt5/PKGBUILD +++ /dev/null @@ -1,120 +0,0 @@ -# Maintainer : Valeria Fadeeva -# Calamares installer (fork from EndeavourOS) configured for Melawy Linux - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -release_name=$pkgname -pkgver=3.3.0.11077 -pkgrel=1 -pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') -url="https://git.melawy.ru/Installer/$_gitname" -license=('LGPL') -provides=("calamares") -conflicts=('calamares') -options=('!strip' '!emptydirs' 'debug' 'staticlibs') -sha256sums=('SKIP') -source=("git+$url.git#branch=calamares") - -depends=( -'boost-libs' -'ckbcomp' -'cryptsetup' -'dmidecode' -'doxygen' -'gptfdisk' -'hwinfo' -'kconfig5' -'kcoreaddons5' -'kdbusaddons5' -'ki18n5' -'kpackage5' -'kparts5' -'kpmcore' -'kservice5' -'kwidgetsaddons5' -'libatasmart' -'libpwquality' -'networkmanager' -'parted' -'plasma-framework5' -'polkit-qt5' -'python' -'qt5-declarative' -'qt5-location' -'qt5-quickcontrols' -'qt5-quickcontrols2' -'qt5-svg' -'qt5-tools' -'qt5-virtualkeyboard' -'qt5-webengine' -'qt5-xmlpatterns' -'rsync' -'solid5' -'squashfs-tools' -'udisks2' -'upower' -'yaml-cpp' -'melawy-calamares-config' -) - -makedepends=( -'boost' -'clang' -'cmake' -'extra-cmake-modules' -'gawk' -'git' -'kdbusaddons5' -'kpmcore' -'ninja' -'python-jsonschema' -'python-pyaml' -'python-unidecode' -'qt5-tools' -) - -pkgver() { - cd "${srcdir}/${_gitname}" - printf "3.3.0.%s" "$(git rev-list --count HEAD)" -} - -prepare() { - # Update branding.desc with the proper values - replace_command=' - { - gsub(/\${version}/,version); - gsub(/\${release_name}/,release); - print - } - ' - awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/src/branding/melawy/branding.desc" -} - -build() { - _cpuCount=$(grep -c -w ^processor /proc/cpuinfo) - - cmake -B build -S "${srcdir}/$_gitname" \ - -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DSKIP_MODULES="dracut dracutlukscfg \ - dummycpp dummyprocess dummypython dummypythonqt \ - finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ - openrcdmcryptcfg plasmalnf services-openrc \ - summaryq tracking usersq webview welcomeq" - - export DESTDIR="$srcdir/build" - cmake --build build --parallel $_cpuCount -} - -package() { - DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install - - install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" - install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" - - install -dm 755 "${pkgdir}/usr/bin" - install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" -} diff --git a/Installer/melawy-calamares-qt5/PKGBUILD_with_configs b/Installer/melawy-calamares-qt5/PKGBUILD_with_configs deleted file mode 100644 index 202c68f..0000000 --- a/Installer/melawy-calamares-qt5/PKGBUILD_with_configs +++ /dev/null @@ -1,133 +0,0 @@ -# Maintainer : Valeria Fadeeva -# Calamares installer (fork from EndeavourOS) configured for Melawy Linux - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -release_name=$pkgname -pkgver=3.3.0.11031 -pkgrel=1 -pkgdesc="$(head -n 2 README.md | tail -n 1)" -arch=('any') -url="https://git.melawy.ru/Melawy-Linux/$_gitname" -license=('LGPL') -provides=("calamares") -conflicts=('calamares') -options=('!strip' '!emptydirs' 'debug' '!staticlibs') -sha256sums=('SKIP') -source=("git+https://git.melawy.ru/Melawy-Linux/$_gitname.git#branch=calamares") - -depends=( -'boost-libs' -'ckbcomp' -'cryptsetup' -'dmidecode' -'doxygen' -'gptfdisk' -'hwinfo' -'kconfig5' -'kcoreaddons5' -'kdbusaddons5' -'ki18n5' -'kpackage5' -'kparts5' -'kpmcore' -'kservice5' -'kwidgetsaddons5' -'libatasmart' -'libpwquality' -'networkmanager' -'parted' -'plasma-framework5' -'polkit-qt5' -'python' -'qt5-declarative' -'qt5-location' -'qt5-quickcontrols' -'qt5-quickcontrols2' -'qt5-svg' -'qt5-tools' -'qt5-virtualkeyboard' -'qt5-webengine' -'qt5-xmlpatterns' -'rsync' -'solid5' -'squashfs-tools' -'udisks2' -'upower' -'yaml-cpp' -) - -makedepends=( -'boost' -'clang' -'cmake' -'extra-cmake-modules' -'gawk' -'git' -'kdbusaddons5' -'kpmcore' -'ninja' -'python-jsonschema' -'python-pyaml' -'python-unidecode' -'qt5-tools' -) - -pkgver() { - cd "${srcdir}/${_gitname}" - printf "3.3.0.%s" "$(git rev-list --count HEAD)" -} - -prepare() { - # Update branding.desc with the proper values - replace_command=' - { - gsub(/\${version}/,version); - gsub(/\${release_name}/,release); - print - } - ' - awk -i inplace -v version="$(pkgver)" -v release="${release_name}" "$replace_command" "${srcdir}/$_gitname/src/branding/melawy/branding.desc" -} - -build() { - _cpuCount=$(grep -c -w ^processor /proc/cpuinfo) - - cmake -B build -S "${srcdir}/$_gitname" \ - -GNinja \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DSKIP_MODULES="dracut dracutlukscfg \ - dummycpp dummyprocess dummypython dummypythonqt \ - finishedq initcpio interactiveterminal initramfs initramfscfg keyboardq license localeq notesqml oemid \ - openrcdmcryptcfg plasmalnf services-openrc \ - summaryq tracking usersq webview welcomeq" - - export DESTDIR="$srcdir/build" - cmake --build build --parallel $_cpuCount -} - -package() { - DESTDIR="${pkgdir}" cmake --build "${DESTDIR}" --target install - - install -dm 755 "${pkgdir}/etc/calamares" - cp -f ${srcdir}/$_gitname/settings_offline.conf "$pkgdir/etc/calamares/settings_offline.conf" - cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings_online.conf" - cp -f ${srcdir}/$_gitname/settings_online.conf "$pkgdir/etc/calamares/settings.conf" - - cp -rf ${srcdir}/$_gitname/src/scripts "$pkgdir/etc/calamares" - cp -rf ${srcdir}/$_gitname/src/images "$pkgdir/etc/calamares" - cp -rf ${srcdir}/$_gitname/src/files "$pkgdir/etc/calamares" - - install -dm 755 "${pkgdir}/etc/calamares/modules" - cp -rf ${srcdir}/$_gitname/src/modules/*/*.conf "$pkgdir/etc/calamares/modules" - - cp -f "${srcdir}/$_gitname/src/modules/netinstall/netinstall.yaml" "$pkgdir/etc/calamares/modules/netinstall.yaml" - - install -dm 750 "${pkgdir}/etc/polkit-1/rules.d" - install -Dm644 "${srcdir}/$_gitname/49-nopasswd-calamares.rules" "${pkgdir}/etc/polkit-1/rules.d/49-nopasswd-calamares.rules" - - install -dm 755 "${pkgdir}/usr/bin" - install -Dm755 "${srcdir}/$_gitname/calamares_polkit" "${pkgdir}/usr/bin/calamares_polkit" -} diff --git a/Installer/melawy-calamares-qt5/лишнее.txt b/Installer/melawy-calamares-qt5/лишнее.txt deleted file mode 100644 index f3c26f4..0000000 --- a/Installer/melawy-calamares-qt5/лишнее.txt +++ /dev/null @@ -1,4 +0,0 @@ - -DWITH_PYTHONQT=OFF \ - -DWITH_KF5DBus=OFF \ - -DBoost_NO_BOOST_CMAKE=ON \ - -DWEBVIEW_FORCE_WEBKIT=OFF \ diff --git a/Installer/melawy-calamares-qt6/.gitignore b/Installer/melawy-calamares-qt6/.gitignore deleted file mode 100644 index 603a633..0000000 --- a/Installer/melawy-calamares-qt6/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -*.tar.* -pkg/ -src/ -/melawy-calamares-qt6 diff --git a/Installer/melawy-welcome/00_make.sh b/Installer/melawy-welcome/00_make.sh deleted file mode 100755 index 30b8975..0000000 --- a/Installer/melawy-welcome/00_make.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - -for i in *.pkg.tar.zst; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -for i in *.pkg.tar.xz; -do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Installer/move_to_repo.sh b/Installer/move_to_repo.sh deleted file mode 100755 index 488d7f5..0000000 --- a/Installer/move_to_repo.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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/Design/Fenek/melawy-kde-theme-fenek/.gitignore b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/.gitignore similarity index 100% rename from Design/Fenek/melawy-kde-theme-fenek/.gitignore rename to MELAWY/Design/Fenek/melawy-kde-theme-fenek/.gitignore diff --git a/Design/Fenek/melawy-kde-theme-fenek/00_make.sh b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/00_make.sh similarity index 100% rename from Design/Fenek/melawy-kde-theme-fenek/00_make.sh rename to MELAWY/Design/Fenek/melawy-kde-theme-fenek/00_make.sh diff --git a/Design/Fenek/melawy-kde-theme-fenek/01_sign.sh b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/01_sign.sh similarity index 100% rename from Design/Fenek/melawy-kde-theme-fenek/01_sign.sh rename to MELAWY/Design/Fenek/melawy-kde-theme-fenek/01_sign.sh diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD similarity index 98% rename from Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD rename to MELAWY/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD index 60c91c4..0a0e9fd 100644 --- a/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD +++ b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Fenek/melawy-kde-theme-fenek/README.md b/MELAWY/Design/Fenek/melawy-kde-theme-fenek/README.md similarity index 100% rename from Design/Fenek/melawy-kde-theme-fenek/README.md rename to MELAWY/Design/Fenek/melawy-kde-theme-fenek/README.md diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/.gitignore b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/.gitignore similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/.gitignore rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/.gitignore diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/00_make.sh diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/01_sign.sh b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/01_sign.sh similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/01_sign.sh rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/01_sign.sh diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/PKGBUILD diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/README.md b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/README.md similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/README.md rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/README.md diff --git a/Design/Fenek/melawy-plymouth-theme-fenek/ins.install b/MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/ins.install similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-fenek/ins.install rename to MELAWY/Design/Fenek/melawy-plymouth-theme-fenek/ins.install diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/.gitignore b/MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/.gitignore similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-hard-install-fenek/.gitignore rename to MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/.gitignore diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh b/MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh rename to MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/00_make.sh diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/01_sign.sh b/MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/01_sign.sh similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-hard-install-fenek/01_sign.sh rename to MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/01_sign.sh diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD b/MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD rename to MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/PKGBUILD diff --git a/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install b/MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install similarity index 100% rename from Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install rename to MELAWY/Design/Fenek/melawy-plymouth-theme-hard-install-fenek/ins.install diff --git a/Design/Fenek/melawy-refind-theme-fenek/.gitignore b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/.gitignore similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/.gitignore rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/.gitignore diff --git a/Design/Fenek/melawy-refind-theme-fenek/00_make.sh b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/00_make.sh similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/00_make.sh rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/00_make.sh diff --git a/Design/Fenek/melawy-refind-theme-fenek/01_sign.sh b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/01_sign.sh similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/01_sign.sh rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/01_sign.sh diff --git a/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/PKGBUILD rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/PKGBUILD diff --git a/Design/Fenek/melawy-refind-theme-fenek/README.md b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/README.md similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/README.md rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/README.md diff --git a/Design/Fenek/melawy-refind-theme-fenek/ins.install b/MELAWY/Design/Fenek/melawy-refind-theme-fenek/ins.install similarity index 100% rename from Design/Fenek/melawy-refind-theme-fenek/ins.install rename to MELAWY/Design/Fenek/melawy-refind-theme-fenek/ins.install diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore b/MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore similarity index 100% rename from Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore rename to MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/.gitignore diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh b/MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh similarity index 100% rename from Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh rename to MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/00_make.sh diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh b/MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh similarity index 100% rename from Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh rename to MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/01_sign.sh diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD b/MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD similarity index 100% rename from Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD rename to MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/PKGBUILD diff --git a/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install b/MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install similarity index 100% rename from Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install rename to MELAWY/Design/Fenek/melawy-refind-theme-hard-install-fenek/ins.install diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore b/MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore similarity index 100% rename from Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore rename to MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/.gitignore diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh b/MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh similarity index 100% rename from Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh rename to MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/00_make.sh diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh b/MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh similarity index 100% rename from Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh rename to MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/01_sign.sh diff --git a/Design/Fenek/melawy-kde-theme-fenek/PKGBUILD b/MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD similarity index 100% rename from Design/Fenek/melawy-kde-theme-fenek/PKGBUILD rename to MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md b/MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md similarity index 100% rename from Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md rename to MELAWY/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/README.md diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/.gitignore b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/.gitignore similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/.gitignore rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/.gitignore diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/00_make.sh diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/01_sign.sh b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/01_sign.sh similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/01_sign.sh rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/01_sign.sh diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/PKGBUILD diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-hard-install-lera-sugar/ins.install diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/.gitignore b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/.gitignore similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/.gitignore rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/.gitignore diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/00_make.sh diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/01_sign.sh b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/01_sign.sh similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/01_sign.sh rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/01_sign.sh diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/PKGBUILD diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/README.md b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/README.md similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/README.md rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/README.md diff --git a/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install b/MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install similarity index 100% rename from Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install rename to MELAWY/Design/Lera-Sugar/melawy-plymouth-theme-lera-sugar/ins.install diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/.gitignore diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/00_make.sh diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/01_sign.sh diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/PKGBUILD diff --git a/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-hard-install-lera-sugar/ins.install diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/.gitignore b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/.gitignore similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/.gitignore rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/.gitignore diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/00_make.sh diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/01_sign.sh b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/01_sign.sh similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/01_sign.sh rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/01_sign.sh diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/PKGBUILD diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/README.md b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/README.md similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/README.md rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/README.md diff --git a/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install b/MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install similarity index 100% rename from Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install rename to MELAWY/Design/Lera-Sugar/melawy-refind-theme-lera-sugar/ins.install diff --git a/Design/Melawy/melawy-icon-theme/.gitignore b/MELAWY/Design/Melawy/melawy-icon-theme/.gitignore similarity index 100% rename from Design/Melawy/melawy-icon-theme/.gitignore rename to MELAWY/Design/Melawy/melawy-icon-theme/.gitignore diff --git a/Design/Melawy/melawy-icon-theme/00_make.sh b/MELAWY/Design/Melawy/melawy-icon-theme/00_make.sh similarity index 100% rename from Design/Melawy/melawy-icon-theme/00_make.sh rename to MELAWY/Design/Melawy/melawy-icon-theme/00_make.sh diff --git a/Design/Melawy/melawy-icon-theme/01_sign.sh b/MELAWY/Design/Melawy/melawy-icon-theme/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-icon-theme/01_sign.sh rename to MELAWY/Design/Melawy/melawy-icon-theme/01_sign.sh diff --git a/Design/Melawy/melawy-icon-theme/PKGBUILD b/MELAWY/Design/Melawy/melawy-icon-theme/PKGBUILD similarity index 100% rename from Design/Melawy/melawy-icon-theme/PKGBUILD rename to MELAWY/Design/Melawy/melawy-icon-theme/PKGBUILD diff --git a/Design/Melawy/melawy-icon-theme/README.md b/MELAWY/Design/Melawy/melawy-icon-theme/README.md similarity index 100% rename from Design/Melawy/melawy-icon-theme/README.md rename to MELAWY/Design/Melawy/melawy-icon-theme/README.md diff --git a/Design/Melawy/melawy-plasma-desktop-theme/.gitignore b/MELAWY/Design/Melawy/melawy-plasma-desktop-theme/.gitignore similarity index 100% rename from Design/Melawy/melawy-plasma-desktop-theme/.gitignore rename to MELAWY/Design/Melawy/melawy-plasma-desktop-theme/.gitignore diff --git a/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh b/MELAWY/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh similarity index 100% rename from Design/Melawy/melawy-plasma-desktop-theme/00_make.sh rename to MELAWY/Design/Melawy/melawy-plasma-desktop-theme/00_make.sh diff --git a/Design/Melawy/melawy-plasma-desktop-theme/01_sign.sh b/MELAWY/Design/Melawy/melawy-plasma-desktop-theme/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-plasma-desktop-theme/01_sign.sh rename to MELAWY/Design/Melawy/melawy-plasma-desktop-theme/01_sign.sh diff --git a/Design/Melawy/melawy-plasma-desktop-theme/PKGBUILD b/MELAWY/Design/Melawy/melawy-plasma-desktop-theme/PKGBUILD similarity index 100% rename from Design/Melawy/melawy-plasma-desktop-theme/PKGBUILD rename to MELAWY/Design/Melawy/melawy-plasma-desktop-theme/PKGBUILD diff --git a/Design/Melawy/melawy-plasma-desktop-theme/README.md b/MELAWY/Design/Melawy/melawy-plasma-desktop-theme/README.md similarity index 100% rename from Design/Melawy/melawy-plasma-desktop-theme/README.md rename to MELAWY/Design/Melawy/melawy-plasma-desktop-theme/README.md diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/.gitignore b/MELAWY/Design/Melawy/melawy-plymouth-theme/.gitignore new file mode 100644 index 0000000..2249dcb --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-plymouth-theme-fenek diff --git a/Design/Melawy/melawy-theme/00_make.sh b/MELAWY/Design/Melawy/melawy-plymouth-theme/00_make.sh similarity index 100% rename from Design/Melawy/melawy-theme/00_make.sh rename to MELAWY/Design/Melawy/melawy-plymouth-theme/00_make.sh diff --git a/Design/Melawy/melawy-purple-dark-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-plymouth-theme/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-purple-dark-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-plymouth-theme/01_sign.sh diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/PKGBUILD b/MELAWY/Design/Melawy/melawy-plymouth-theme/PKGBUILD new file mode 100644 index 0000000..d035fa1 --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/PKGBUILD @@ -0,0 +1,39 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.22 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +url="https://git.melawy.ru/Design/$_gitname" +arch=("any") +license=("AGPL3") +depends=("plymouth") +optdepends=() +makedepends=("git") +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') + +THEME_NAME="melawy" +THEME_PATH="usr/share/plymouth/themes" + +# 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() { + install -d "$pkgdir/$THEME_PATH" + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/$THEME_NAME" "$pkgdir/$THEME_PATH/" +} + +install=ins.install diff --git a/Installer/melawy-calamares-qt6/README.md b/MELAWY/Design/Melawy/melawy-plymouth-theme/README.md similarity index 76% rename from Installer/melawy-calamares-qt6/README.md rename to MELAWY/Design/Melawy/melawy-plymouth-theme/README.md index b3f029e..8025f8f 100644 --- a/Installer/melawy-calamares-qt6/README.md +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/README.md @@ -1,5 +1,5 @@ -# calamares -Calamares installer for Melawy Linux - Development version +# melawy-plymouth-theme-fenek +Plymouth theme for theme Fenek ### Donate [Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/ins.install b/MELAWY/Design/Melawy/melawy-plymouth-theme/ins.install new file mode 100644 index 0000000..619699c --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/ins.install @@ -0,0 +1,9 @@ +post_install() { + if [ "$(grep 'Theme' /etc/plymouth/plymouthd.conf | cut -d'=' -f2)" == "melawy" ]; then + plymouth-set-default-theme -R + fi +} + +post_upgrade() { + post_install +} diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/FETCH_HEAD b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/FETCH_HEAD new file mode 100644 index 0000000..cc75f7f --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/FETCH_HEAD @@ -0,0 +1 @@ +e36b6da1b5b8375d2870eaa92ceff17e4d9bc496 not-for-merge branch 'main' of https://git.melawy.ru/Design/melawy-plymouth-theme diff --git a/Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/HEAD b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/HEAD similarity index 100% rename from Design/Win11/melawy-kde-theme-win12/melawy-kde-theme-win12/HEAD rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/HEAD diff --git a/Core/chwd/chwd/config b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/config similarity index 66% rename from Core/chwd/chwd/config rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/config index 92ff684..d427069 100644 --- a/Core/chwd/chwd/config +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/config @@ -3,6 +3,6 @@ filemode = true bare = true [remote "origin"] - url = https://github.com/cachyos/chwd.git + url = https://git.melawy.ru/Design/melawy-plymouth-theme.git fetch = +refs/*:refs/* mirror = true diff --git a/Core/chwd/chwd-db/description b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/description similarity index 100% rename from Core/chwd/chwd-db/description rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/description diff --git a/Core/chwd/chwd-db/hooks/applypatch-msg.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/applypatch-msg.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/applypatch-msg.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/applypatch-msg.sample diff --git a/Core/chwd/chwd-db/hooks/commit-msg.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/commit-msg.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/commit-msg.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/commit-msg.sample diff --git a/Core/chwd/chwd-db/hooks/fsmonitor-watchman.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/fsmonitor-watchman.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/fsmonitor-watchman.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/fsmonitor-watchman.sample diff --git a/Core/chwd/chwd-db/hooks/post-update.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/post-update.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/post-update.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/post-update.sample diff --git a/Core/chwd/chwd-db/hooks/pre-applypatch.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-applypatch.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-applypatch.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-applypatch.sample diff --git a/Core/chwd/chwd-db/hooks/pre-commit.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-commit.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-commit.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-commit.sample diff --git a/Core/chwd/chwd-db/hooks/pre-merge-commit.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-merge-commit.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-merge-commit.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-merge-commit.sample diff --git a/Core/chwd/chwd-db/hooks/pre-push.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-push.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-push.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-push.sample diff --git a/Core/chwd/chwd-db/hooks/pre-rebase.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-rebase.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-rebase.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-rebase.sample diff --git a/Core/chwd/chwd-db/hooks/pre-receive.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-receive.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/pre-receive.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/pre-receive.sample diff --git a/Core/chwd/chwd-db/hooks/prepare-commit-msg.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/prepare-commit-msg.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/prepare-commit-msg.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/prepare-commit-msg.sample diff --git a/Core/chwd/chwd-db/hooks/push-to-checkout.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/push-to-checkout.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/push-to-checkout.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/push-to-checkout.sample diff --git a/Core/chwd/chwd-db/hooks/sendemail-validate.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/sendemail-validate.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/sendemail-validate.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/sendemail-validate.sample diff --git a/Core/chwd/chwd-db/hooks/update.sample b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/update.sample similarity index 100% rename from Core/chwd/chwd-db/hooks/update.sample rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/hooks/update.sample diff --git a/Core/chwd/chwd-db/info/exclude b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/info/exclude similarity index 100% rename from Core/chwd/chwd-db/info/exclude rename to MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/info/exclude diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/1d/f70b5c41d3a263185e802c56566ebf4f3429f5 b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/1d/f70b5c41d3a263185e802c56566ebf4f3429f5 new file mode 100644 index 0000000..7d727dd Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/1d/f70b5c41d3a263185e802c56566ebf4f3429f5 differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/83/be7dfc74370f0ade0b512d70b0019c104b7f48 b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/83/be7dfc74370f0ade0b512d70b0019c104b7f48 new file mode 100644 index 0000000..cceaee7 Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/83/be7dfc74370f0ade0b512d70b0019c104b7f48 differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/98/e7ca248f5a5362d2ddc56a4fc0025e56d21179 b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/98/e7ca248f5a5362d2ddc56a4fc0025e56d21179 new file mode 100644 index 0000000..e9d7dc8 Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/98/e7ca248f5a5362d2ddc56a4fc0025e56d21179 differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/e3/6b6da1b5b8375d2870eaa92ceff17e4d9bc496 b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/e3/6b6da1b5b8375d2870eaa92ceff17e4d9bc496 new file mode 100644 index 0000000..8a1611a Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/e3/6b6da1b5b8375d2870eaa92ceff17e4d9bc496 differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.idx b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.idx new file mode 100644 index 0000000..47ec591 Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.idx differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.pack b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.pack new file mode 100644 index 0000000..68e972c Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.pack differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.rev b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.rev new file mode 100644 index 0000000..60b3d3b Binary files /dev/null and b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/objects/pack/pack-b42c37c710139d00c12d1a23301659d6dc38f8b6.rev differ diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/packed-refs b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/packed-refs new file mode 100644 index 0000000..2262141 --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +738e5ce084554bf93a85e283a57de4869ec21eab refs/heads/main diff --git a/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/refs/heads/main b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/refs/heads/main new file mode 100644 index 0000000..1c19a38 --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-plymouth-theme/melawy-plymouth-theme/refs/heads/main @@ -0,0 +1 @@ +e36b6da1b5b8375d2870eaa92ceff17e4d9bc496 diff --git a/Design/Melawy/melawy-purple-dark-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-purple-dark-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-purple-dark-cursors/.gitignore diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/00_make.sh similarity index 100% rename from Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh rename to MELAWY/Design/Melawy/melawy-purple-dark-cursors/00_make.sh diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-purple-dark-default-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-purple-dark-cursors/01_sign.sh diff --git a/Design/Melawy/melawy-purple-light-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/PKGBUILD similarity index 87% rename from Design/Melawy/melawy-purple-light-cursors/PKGBUILD rename to MELAWY/Design/Melawy/melawy-purple-dark-cursors/PKGBUILD index 44aa53e..28a00e1 100644 --- a/Design/Melawy/melawy-purple-light-cursors/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -20,7 +20,7 @@ sha256sums=("SKIP") validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { -# cd "$srcdir/Melawy-icon-theme" +# cd "$srcdir/$_gitname" # git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' # } @@ -36,5 +36,5 @@ pkgver() { package() { install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" } diff --git a/Design/Melawy/melawy-purple-dark-cursors/README.md b/MELAWY/Design/Melawy/melawy-purple-dark-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-purple-dark-cursors/README.md rename to MELAWY/Design/Melawy/melawy-purple-dark-cursors/README.md diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-purple-dark-default-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/.gitignore diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh rename to MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh diff --git a/Design/Melawy/melawy-purple-light-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-purple-light-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/01_sign.sh diff --git a/Design/Melawy/melawy-red-light-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD similarity index 88% rename from Design/Melawy/melawy-red-light-cursors/PKGBUILD rename to MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD index 3cc1b6b..5d8e6fb 100644 --- a/Design/Melawy/melawy-red-light-cursors/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD @@ -20,7 +20,7 @@ sha256sums=("SKIP") validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { -# cd "$srcdir/Melawy-icon-theme" +# cd "$srcdir/$_gitname" # git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' # } @@ -36,5 +36,5 @@ pkgver() { package() { install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" } diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/README.md b/MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-purple-dark-default-cursors/README.md rename to MELAWY/Design/Melawy/melawy-purple-dark-default-cursors/README.md diff --git a/Design/Melawy/melawy-purple-light-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-purple-light-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-purple-light-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-purple-light-cursors/.gitignore diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh b/MELAWY/Design/Melawy/melawy-purple-light-cursors/00_make.sh similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh rename to MELAWY/Design/Melawy/melawy-purple-light-cursors/00_make.sh diff --git a/Design/Melawy/melawy-purple-light-default-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-purple-light-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-purple-light-default-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-purple-light-cursors/01_sign.sh diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-purple-light-cursors/PKGBUILD similarity index 87% rename from Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD rename to MELAWY/Design/Melawy/melawy-purple-light-cursors/PKGBUILD index 20fb9b6..28a00e1 100644 --- a/Design/Melawy/melawy-purple-dark-default-cursors/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-purple-light-cursors/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -20,7 +20,7 @@ sha256sums=("SKIP") validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { -# cd "$srcdir/Melawy-icon-theme" +# cd "$srcdir/$_gitname" # git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' # } @@ -36,5 +36,5 @@ pkgver() { package() { install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" } diff --git a/Design/Melawy/melawy-purple-light-cursors/README.md b/MELAWY/Design/Melawy/melawy-purple-light-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-purple-light-cursors/README.md rename to MELAWY/Design/Melawy/melawy-purple-light-cursors/README.md diff --git a/Design/Melawy/melawy-purple-light-default-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-purple-light-default-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-purple-light-default-cursors/.gitignore diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh rename to MELAWY/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh diff --git a/Design/Melawy/melawy-red-dark-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-red-dark-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-purple-light-default-cursors/01_sign.sh diff --git a/Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD similarity index 87% rename from Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD rename to MELAWY/Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD index 20fb9b6..5d8e6fb 100644 --- a/Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.3 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -20,7 +20,7 @@ sha256sums=("SKIP") validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { -# cd "$srcdir/Melawy-icon-theme" +# cd "$srcdir/$_gitname" # git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' # } @@ -36,5 +36,5 @@ pkgver() { package() { install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" } diff --git a/Design/Melawy/melawy-purple-light-default-cursors/README.md b/MELAWY/Design/Melawy/melawy-purple-light-default-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-purple-light-default-cursors/README.md rename to MELAWY/Design/Melawy/melawy-purple-light-default-cursors/README.md diff --git a/Design/Melawy/melawy-red-dark-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-red-dark-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-red-dark-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-red-dark-cursors/.gitignore diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh b/MELAWY/Design/Melawy/melawy-red-dark-cursors/00_make.sh similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh rename to MELAWY/Design/Melawy/melawy-red-dark-cursors/00_make.sh diff --git a/Design/Melawy/melawy-red-dark-default-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-red-dark-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-red-dark-default-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-red-dark-cursors/01_sign.sh diff --git a/Design/Melawy/melawy-purple-dark-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-red-dark-cursors/PKGBUILD similarity index 87% rename from Design/Melawy/melawy-purple-dark-cursors/PKGBUILD rename to MELAWY/Design/Melawy/melawy-red-dark-cursors/PKGBUILD index 44aa53e..28a00e1 100644 --- a/Design/Melawy/melawy-purple-dark-cursors/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-red-dark-cursors/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" @@ -20,7 +20,7 @@ sha256sums=("SKIP") validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') # pkgver() { -# cd "$srcdir/Melawy-icon-theme" +# cd "$srcdir/$_gitname" # git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' # } @@ -36,5 +36,5 @@ pkgver() { package() { install -d "$pkgdir/usr/share/icons" - cp -r "$srcdir/$_gitname/Melawy-$_gitname" "$pkgdir/usr/share/icons/" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" } diff --git a/Design/Melawy/melawy-red-dark-cursors/README.md b/MELAWY/Design/Melawy/melawy-red-dark-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-red-dark-cursors/README.md rename to MELAWY/Design/Melawy/melawy-red-dark-cursors/README.md diff --git a/Design/Melawy/melawy-red-dark-default-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-red-dark-default-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-red-dark-default-cursors/.gitignore diff --git a/Design/Win11/melawy-kde-theme-win11/00_make.sh b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh similarity index 100% rename from Design/Win11/melawy-kde-theme-win11/00_make.sh rename to MELAWY/Design/Melawy/melawy-red-dark-default-cursors/00_make.sh diff --git a/Design/Melawy/melawy-red-light-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-red-light-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-red-dark-default-cursors/01_sign.sh diff --git a/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD new file mode 100644 index 0000000..5d8e6fb --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.3 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +url="https://git.melawy.ru/Design/$_gitname" +arch=("any") +license=("AGPL3") +depends=() +optdepends=() +makedepends=("git") +options=("!strip") +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') + +# pkgver() { +# cd "$srcdir/$_gitname" +# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +# } + +# 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() { + install -d "$pkgdir/usr/share/icons" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" +} diff --git a/Design/Melawy/melawy-red-dark-default-cursors/README.md b/MELAWY/Design/Melawy/melawy-red-dark-default-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-red-dark-default-cursors/README.md rename to MELAWY/Design/Melawy/melawy-red-dark-default-cursors/README.md diff --git a/Design/Melawy/melawy-red-light-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-red-light-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-red-light-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-red-light-cursors/.gitignore diff --git a/Design/Win11/melawy-kde-theme-win12/00_make.sh b/MELAWY/Design/Melawy/melawy-red-light-cursors/00_make.sh similarity index 100% rename from Design/Win11/melawy-kde-theme-win12/00_make.sh rename to MELAWY/Design/Melawy/melawy-red-light-cursors/00_make.sh diff --git a/Design/Melawy/melawy-red-light-default-cursors/01_sign.sh b/MELAWY/Design/Melawy/melawy-red-light-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-red-light-default-cursors/01_sign.sh rename to MELAWY/Design/Melawy/melawy-red-light-cursors/01_sign.sh diff --git a/MELAWY/Design/Melawy/melawy-red-light-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-red-light-cursors/PKGBUILD new file mode 100644 index 0000000..28a00e1 --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-red-light-cursors/PKGBUILD @@ -0,0 +1,40 @@ +# 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=() +optdepends=() +makedepends=("git") +options=("!strip") +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') + +# pkgver() { +# cd "$srcdir/$_gitname" +# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +# } + +# 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() { + install -d "$pkgdir/usr/share/icons" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" +} diff --git a/Design/Melawy/melawy-red-light-cursors/README.md b/MELAWY/Design/Melawy/melawy-red-light-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-red-light-cursors/README.md rename to MELAWY/Design/Melawy/melawy-red-light-cursors/README.md diff --git a/Design/Melawy/melawy-red-light-default-cursors/.gitignore b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/.gitignore similarity index 100% rename from Design/Melawy/melawy-red-light-default-cursors/.gitignore rename to MELAWY/Design/Melawy/melawy-red-light-default-cursors/.gitignore diff --git a/Design/Win11/melawy-win11-icon-theme/00_make.sh b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/00_make.sh similarity index 100% rename from Design/Win11/melawy-win11-icon-theme/00_make.sh rename to MELAWY/Design/Melawy/melawy-red-light-default-cursors/00_make.sh diff --git a/Design/Melawy/melawy-theme/01_sign.sh b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/01_sign.sh similarity index 100% rename from Design/Melawy/melawy-theme/01_sign.sh rename to MELAWY/Design/Melawy/melawy-red-light-default-cursors/01_sign.sh diff --git a/MELAWY/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD new file mode 100644 index 0000000..5d8e6fb --- /dev/null +++ b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/PKGBUILD @@ -0,0 +1,40 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.3 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +url="https://git.melawy.ru/Design/$_gitname" +arch=("any") +license=("AGPL3") +depends=() +optdepends=() +makedepends=("git") +options=("!strip") +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +source=("git+$url.git") +sha256sums=("SKIP") +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') + +# pkgver() { +# cd "$srcdir/$_gitname" +# git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g' +# } + +# 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() { + install -d "$pkgdir/usr/share/icons" + cp -r "$srcdir/$_gitname/$_gitname" "$pkgdir/usr/share/icons/${_gitname^}" +} diff --git a/Design/Melawy/melawy-red-light-default-cursors/README.md b/MELAWY/Design/Melawy/melawy-red-light-default-cursors/README.md similarity index 100% rename from Design/Melawy/melawy-red-light-default-cursors/README.md rename to MELAWY/Design/Melawy/melawy-red-light-default-cursors/README.md diff --git a/Design/Melawy/melawy-theme/.gitignore b/MELAWY/Design/Melawy/melawy-theme/.gitignore similarity index 100% rename from Design/Melawy/melawy-theme/.gitignore rename to MELAWY/Design/Melawy/melawy-theme/.gitignore diff --git a/Installer/melawy-calamares-config/00_make.sh b/MELAWY/Design/Melawy/melawy-theme/00_make.sh similarity index 100% rename from Installer/melawy-calamares-config/00_make.sh rename to MELAWY/Design/Melawy/melawy-theme/00_make.sh diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh b/MELAWY/Design/Melawy/melawy-theme/01_sign.sh similarity index 100% rename from Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh rename to MELAWY/Design/Melawy/melawy-theme/01_sign.sh diff --git a/Design/Melawy/melawy-theme/PKGBUILD b/MELAWY/Design/Melawy/melawy-theme/PKGBUILD similarity index 98% rename from Design/Melawy/melawy-theme/PKGBUILD rename to MELAWY/Design/Melawy/melawy-theme/PKGBUILD index 0250f12..153f781 100644 --- a/Design/Melawy/melawy-theme/PKGBUILD +++ b/MELAWY/Design/Melawy/melawy-theme/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.5 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Melawy/melawy-theme/README.md b/MELAWY/Design/Melawy/melawy-theme/README.md similarity index 100% rename from Design/Melawy/melawy-theme/README.md rename to MELAWY/Design/Melawy/melawy-theme/README.md diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore b/MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore similarity index 100% rename from Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore rename to MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/.gitignore diff --git a/Melawy/melawy-branding/00_make.sh b/MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh similarity index 100% rename from Melawy/melawy-branding/00_make.sh rename to MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/00_make.sh diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/01_sign.sh b/MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/01_sign.sh rename to MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/01_sign.sh diff --git a/Design/Win11/melawy-kde-theme-win11/PKGBUILD b/MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD similarity index 100% rename from Design/Win11/melawy-kde-theme-win11/PKGBUILD rename to MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/PKGBUILD diff --git a/Design/Nier-A2/melawy-kde-theme-nier-a2/README.md b/MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/README.md similarity index 100% rename from Design/Nier-A2/melawy-kde-theme-nier-a2/README.md rename to MELAWY/Design/Nier-A2/melawy-kde-theme-nier-a2/README.md diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/.gitignore b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/.gitignore similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/.gitignore rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/.gitignore diff --git a/Melawy/melawy-check-reboot-required/00_make.sh b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh similarity index 100% rename from Melawy/melawy-check-reboot-required/00_make.sh rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/00_make.sh diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/01_sign.sh b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/01_sign.sh similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/01_sign.sh rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/01_sign.sh diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/PKGBUILD diff --git a/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-hard-install-nier-a2/ins.install diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/.gitignore b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/.gitignore similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/.gitignore rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/.gitignore diff --git a/Melawy/melawy-dracut-initramfs/00_make.sh b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh similarity index 100% rename from Melawy/melawy-dracut-initramfs/00_make.sh rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/00_make.sh diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/01_sign.sh similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/01_sign.sh diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/PKGBUILD diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/README.md b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/README.md similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/README.md rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/README.md diff --git a/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install b/MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install similarity index 100% rename from Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install rename to MELAWY/Design/Nier-A2/melawy-plymouth-theme-nier-a2/ins.install diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore b/MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore rename to MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/.gitignore diff --git a/Melawy/melawy-dracut-ukify/00_make.sh b/MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh similarity index 100% rename from Melawy/melawy-dracut-ukify/00_make.sh rename to MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/00_make.sh diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/01_sign.sh b/MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/01_sign.sh rename to MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/01_sign.sh diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD b/MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD rename to MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/PKGBUILD diff --git a/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install b/MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install rename to MELAWY/Design/Nier-A2/melawy-refind-theme-hard-install-nier-a2/ins.install diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/.gitignore b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/.gitignore similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/.gitignore rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/.gitignore diff --git a/Melawy/melawy-etc-skel-kvantum/00_make.sh b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh similarity index 100% rename from Melawy/melawy-etc-skel-kvantum/00_make.sh rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/00_make.sh diff --git a/Design/Win11/melawy-kde-theme-win11/01_sign.sh b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/01_sign.sh similarity index 100% rename from Design/Win11/melawy-kde-theme-win11/01_sign.sh rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/01_sign.sh diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/PKGBUILD diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/README.md b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/README.md similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/README.md rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/README.md diff --git a/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install b/MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install similarity index 100% rename from Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install rename to MELAWY/Design/Nier-A2/melawy-refind-theme-nier-a2/ins.install diff --git a/Design/Win11/melawy-kde-theme-win11/.gitignore b/MELAWY/Design/Win11/melawy-kde-theme-win11/.gitignore similarity index 100% rename from Design/Win11/melawy-kde-theme-win11/.gitignore rename to MELAWY/Design/Win11/melawy-kde-theme-win11/.gitignore diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/00_make.sh b/MELAWY/Design/Win11/melawy-kde-theme-win11/00_make.sh similarity index 100% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/00_make.sh rename to MELAWY/Design/Win11/melawy-kde-theme-win11/00_make.sh diff --git a/Design/Win11/melawy-kde-theme-win12/01_sign.sh b/MELAWY/Design/Win11/melawy-kde-theme-win11/01_sign.sh similarity index 100% rename from Design/Win11/melawy-kde-theme-win12/01_sign.sh rename to MELAWY/Design/Win11/melawy-kde-theme-win11/01_sign.sh diff --git a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD b/MELAWY/Design/Win11/melawy-kde-theme-win11/PKGBUILD similarity index 98% rename from Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD rename to MELAWY/Design/Win11/melawy-kde-theme-win11/PKGBUILD index 60c91c4..0a0e9fd 100644 --- a/Design/Lera-Sugar/melawy-kde-theme-lera-sugar/PKGBUILD +++ b/MELAWY/Design/Win11/melawy-kde-theme-win11/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.4 +pkgver=1.6 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Design/$_gitname" diff --git a/Design/Win11/melawy-kde-theme-win11/README.md b/MELAWY/Design/Win11/melawy-kde-theme-win11/README.md similarity index 100% rename from Design/Win11/melawy-kde-theme-win11/README.md rename to MELAWY/Design/Win11/melawy-kde-theme-win11/README.md diff --git a/Design/Win11/melawy-kde-theme-win12/.gitignore b/MELAWY/Design/Win11/melawy-kde-theme-win12/.gitignore similarity index 100% rename from Design/Win11/melawy-kde-theme-win12/.gitignore rename to MELAWY/Design/Win11/melawy-kde-theme-win12/.gitignore diff --git a/Melawy/melawy-linux-keyring/00_make.sh b/MELAWY/Design/Win11/melawy-kde-theme-win12/00_make.sh similarity index 100% rename from Melawy/melawy-linux-keyring/00_make.sh rename to MELAWY/Design/Win11/melawy-kde-theme-win12/00_make.sh diff --git a/Design/Win11/melawy-win11-icon-theme/01_sign.sh b/MELAWY/Design/Win11/melawy-kde-theme-win12/01_sign.sh similarity index 100% rename from Design/Win11/melawy-win11-icon-theme/01_sign.sh rename to MELAWY/Design/Win11/melawy-kde-theme-win12/01_sign.sh diff --git a/Design/Win11/melawy-kde-theme-win12/PKGBUILD b/MELAWY/Design/Win11/melawy-kde-theme-win12/PKGBUILD similarity index 98% rename from Design/Win11/melawy-kde-theme-win12/PKGBUILD rename to MELAWY/Design/Win11/melawy-kde-theme-win12/PKGBUILD index a36be5f..0a0e9fd 100644 --- a/Design/Win11/melawy-kde-theme-win12/PKGBUILD +++ b/MELAWY/Design/Win11/melawy-kde-theme-win12/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/Design/$_gitname" diff --git a/Design/Win11/melawy-kde-theme-win12/README.md b/MELAWY/Design/Win11/melawy-kde-theme-win12/README.md similarity index 100% rename from Design/Win11/melawy-kde-theme-win12/README.md rename to MELAWY/Design/Win11/melawy-kde-theme-win12/README.md diff --git a/Design/Win11/melawy-win11-icon-theme/.gitignore b/MELAWY/Design/Win11/melawy-win11-icon-theme/.gitignore similarity index 100% rename from Design/Win11/melawy-win11-icon-theme/.gitignore rename to MELAWY/Design/Win11/melawy-win11-icon-theme/.gitignore diff --git a/Melawy/melawy-linux-mirrorlist/00_make.sh b/MELAWY/Design/Win11/melawy-win11-icon-theme/00_make.sh similarity index 100% rename from Melawy/melawy-linux-mirrorlist/00_make.sh rename to MELAWY/Design/Win11/melawy-win11-icon-theme/00_make.sh diff --git a/Installer/melawy-calamares-config/01_sign.sh b/MELAWY/Design/Win11/melawy-win11-icon-theme/01_sign.sh similarity index 100% rename from Installer/melawy-calamares-config/01_sign.sh rename to MELAWY/Design/Win11/melawy-win11-icon-theme/01_sign.sh diff --git a/Design/Win11/melawy-win11-icon-theme/PKGBUILD b/MELAWY/Design/Win11/melawy-win11-icon-theme/PKGBUILD similarity index 100% rename from Design/Win11/melawy-win11-icon-theme/PKGBUILD rename to MELAWY/Design/Win11/melawy-win11-icon-theme/PKGBUILD diff --git a/Design/Win11/melawy-win11-icon-theme/README.md b/MELAWY/Design/Win11/melawy-win11-icon-theme/README.md similarity index 100% rename from Design/Win11/melawy-win11-icon-theme/README.md rename to MELAWY/Design/Win11/melawy-win11-icon-theme/README.md diff --git a/Design/win11OS-kde-git/.gitignore b/MELAWY/Design/Win11OS-kde/.gitignore similarity index 100% rename from Design/win11OS-kde-git/.gitignore rename to MELAWY/Design/Win11OS-kde/.gitignore diff --git a/Design/win11OS-kde-git/PKGBUILD b/MELAWY/Design/Win11OS-kde/PKGBUILD similarity index 100% rename from Design/win11OS-kde-git/PKGBUILD rename to MELAWY/Design/Win11OS-kde/PKGBUILD diff --git a/Design/win12OS-kde-git/.gitignore b/MELAWY/Design/Win12OS-kde/.gitignore similarity index 100% rename from Design/win12OS-kde-git/.gitignore rename to MELAWY/Design/Win12OS-kde/.gitignore diff --git a/Design/win12OS-kde-git/PKGBUILD b/MELAWY/Design/Win12OS-kde/PKGBUILD similarity index 100% rename from Design/win12OS-kde-git/PKGBUILD rename to MELAWY/Design/Win12OS-kde/PKGBUILD diff --git a/MELAWY/Design/clean.sh b/MELAWY/Design/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Design/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Design/make.sh b/MELAWY/Design/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Design/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Design/move_to_repo.sh b/MELAWY/Design/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Design/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Design/pwd.txt b/MELAWY/Design/pwd.txt similarity index 100% rename from Design/pwd.txt rename to MELAWY/Design/pwd.txt diff --git a/MELAWY/Installer/clean.sh b/MELAWY/Installer/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Installer/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Installer/make.sh b/MELAWY/Installer/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Installer/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Installer/melawy-calamares-config-3.3.1/.gitignore b/MELAWY/Installer/melawy-calamares-config-3.3.1/.gitignore new file mode 100644 index 0000000..7a309b9 --- /dev/null +++ b/MELAWY/Installer/melawy-calamares-config-3.3.1/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-calamares-qt6-3.3.1 diff --git a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh b/MELAWY/Installer/melawy-calamares-config-3.3.1/00_make.sh similarity index 87% rename from Design/Melawy/melawy-purple-light-default-cursors/00_make.sh rename to MELAWY/Installer/melawy-calamares-config-3.3.1/00_make.sh index 30b8975..fd0b74f 100755 --- a/Design/Melawy/melawy-purple-light-default-cursors/00_make.sh +++ b/MELAWY/Installer/melawy-calamares-config-3.3.1/00_make.sh @@ -2,6 +2,10 @@ makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force +if [ "$?" -ne 0 ]; then + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force +fi + for i in *.pkg.tar.zst; do if [ -f "${i}" ]; then @@ -22,7 +26,6 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -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/01_sign.sh b/MELAWY/Installer/melawy-calamares-config-3.3.1/01_sign.sh similarity index 100% rename from Installer/melawy-calamares-qt5/01_sign.sh rename to MELAWY/Installer/melawy-calamares-config-3.3.1/01_sign.sh diff --git a/Installer/melawy-calamares-config/PKGBUILD b/MELAWY/Installer/melawy-calamares-config-3.3.1/PKGBUILD similarity index 97% rename from Installer/melawy-calamares-config/PKGBUILD rename to MELAWY/Installer/melawy-calamares-config-3.3.1/PKGBUILD index e97c22b..9c5bf9b 100644 --- a/Installer/melawy-calamares-config/PKGBUILD +++ b/MELAWY/Installer/melawy-calamares-config-3.3.1/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer : Valeria Fadeeva # Calamares installer (fork from EndeavourOS) configured for Melawy Linux -_gitname="melawy-calamares-qt6" +_gitname="melawy-calamares-qt6-3.3.1" pkgname="$(basename $(pwd))" release_name=$pkgname -pkgver=3.3.0.10981 +pkgver=3.3.0.11017 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Installer/melawy-calamares-config/README.md b/MELAWY/Installer/melawy-calamares-config-3.3.1/README.md similarity index 100% rename from Installer/melawy-calamares-config/README.md rename to MELAWY/Installer/melawy-calamares-config-3.3.1/README.md diff --git a/MELAWY/Installer/melawy-calamares-qt6-3.3.1/.gitignore b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/.gitignore new file mode 100644 index 0000000..7a309b9 --- /dev/null +++ b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/.gitignore @@ -0,0 +1,4 @@ +*.tar.* +pkg/ +src/ +/melawy-calamares-qt6-3.3.1 diff --git a/Design/Melawy/melawy-red-dark-cursors/00_make.sh b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/00_make.sh similarity index 87% rename from Design/Melawy/melawy-red-dark-cursors/00_make.sh rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/00_make.sh index 30b8975..fd0b74f 100755 --- a/Design/Melawy/melawy-red-dark-cursors/00_make.sh +++ b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/00_make.sh @@ -2,6 +2,10 @@ makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force +if [ "$?" -ne 0 ]; then + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force +fi + for i in *.pkg.tar.zst; do if [ -f "${i}" ]; then @@ -22,7 +26,6 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -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/01_sign.sh b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/01_sign.sh similarity index 100% rename from Installer/melawy-calamares-qt6/01_sign.sh rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/01_sign.sh diff --git a/Installer/melawy-calamares-qt6/PKGBUILD b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD similarity index 98% rename from Installer/melawy-calamares-qt6/PKGBUILD rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD index fbd215d..6807936 100644 --- a/Installer/melawy-calamares-qt6/PKGBUILD +++ b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD @@ -4,7 +4,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.10981 +pkgver=3.3.0.11017 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') @@ -55,7 +55,7 @@ depends=( 'udisks2' 'upower' 'yaml-cpp' -'melawy-calamares-config' +'melawy-calamares-config-3.3.1' ) makedepends=( diff --git a/Installer/melawy-calamares-qt6/PKGBUILD_6 b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD_6 similarity index 100% rename from Installer/melawy-calamares-qt6/PKGBUILD_6 rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD_6 diff --git a/Installer/melawy-calamares-qt6/PKGBUILD_with_configs b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD_with_configs similarity index 100% rename from Installer/melawy-calamares-qt6/PKGBUILD_with_configs rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/PKGBUILD_with_configs diff --git a/Installer/melawy-calamares-qt5/README.md b/MELAWY/Installer/melawy-calamares-qt6-3.3.1/README.md similarity index 100% rename from Installer/melawy-calamares-qt5/README.md rename to MELAWY/Installer/melawy-calamares-qt6-3.3.1/README.md diff --git a/Installer/melawy-welcome/.gitignore b/MELAWY/Installer/melawy-welcome/.gitignore similarity index 100% rename from Installer/melawy-welcome/.gitignore rename to MELAWY/Installer/melawy-welcome/.gitignore diff --git a/Design/Melawy/melawy-purple-dark-cursors/00_make.sh b/MELAWY/Installer/melawy-welcome/00_make.sh similarity index 100% rename from Design/Melawy/melawy-purple-dark-cursors/00_make.sh rename to MELAWY/Installer/melawy-welcome/00_make.sh diff --git a/Installer/melawy-welcome/01_sign.sh b/MELAWY/Installer/melawy-welcome/01_sign.sh similarity index 100% rename from Installer/melawy-welcome/01_sign.sh rename to MELAWY/Installer/melawy-welcome/01_sign.sh diff --git a/Installer/melawy-welcome/PKGBUILD b/MELAWY/Installer/melawy-welcome/PKGBUILD similarity index 100% rename from Installer/melawy-welcome/PKGBUILD rename to MELAWY/Installer/melawy-welcome/PKGBUILD diff --git a/Installer/melawy-welcome/README.md b/MELAWY/Installer/melawy-welcome/README.md similarity index 100% rename from Installer/melawy-welcome/README.md rename to MELAWY/Installer/melawy-welcome/README.md diff --git a/MELAWY/Installer/move_to_repo.sh b/MELAWY/Installer/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Installer/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Installer/pwd.txt b/MELAWY/Installer/pwd.txt similarity index 100% rename from Installer/pwd.txt rename to MELAWY/Installer/pwd.txt diff --git a/MELAWY/Melawy/clean.sh b/MELAWY/Melawy/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Melawy/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Melawy/make.sh b/MELAWY/Melawy/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Melawy/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/Melawy/melawy-branding/.gitignore b/MELAWY/Melawy/melawy-branding/.gitignore similarity index 100% rename from Melawy/melawy-branding/.gitignore rename to MELAWY/Melawy/melawy-branding/.gitignore diff --git a/Melawy/melawy-refind-menu-generator/00_make.sh b/MELAWY/Melawy/melawy-branding/00_make.sh similarity index 100% rename from Melawy/melawy-refind-menu-generator/00_make.sh rename to MELAWY/Melawy/melawy-branding/00_make.sh diff --git a/Melawy/melawy-branding/01_sign.sh b/MELAWY/Melawy/melawy-branding/01_sign.sh similarity index 100% rename from Melawy/melawy-branding/01_sign.sh rename to MELAWY/Melawy/melawy-branding/01_sign.sh diff --git a/Melawy/melawy-branding/PKGBUILD b/MELAWY/Melawy/melawy-branding/PKGBUILD similarity index 100% rename from Melawy/melawy-branding/PKGBUILD rename to MELAWY/Melawy/melawy-branding/PKGBUILD diff --git a/Melawy/melawy-branding/README.md b/MELAWY/Melawy/melawy-branding/README.md similarity index 100% rename from Melawy/melawy-branding/README.md rename to MELAWY/Melawy/melawy-branding/README.md diff --git a/Melawy/melawy-check-reboot-required/.gitignore b/MELAWY/Melawy/melawy-check-reboot-required/.gitignore similarity index 100% rename from Melawy/melawy-check-reboot-required/.gitignore rename to MELAWY/Melawy/melawy-check-reboot-required/.gitignore diff --git a/Melawy/melawy-skel-liveuser/00_make.sh b/MELAWY/Melawy/melawy-check-reboot-required/00_make.sh similarity index 100% rename from Melawy/melawy-skel-liveuser/00_make.sh rename to MELAWY/Melawy/melawy-check-reboot-required/00_make.sh diff --git a/Melawy/melawy-check-reboot-required/01_sign.sh b/MELAWY/Melawy/melawy-check-reboot-required/01_sign.sh similarity index 100% rename from Melawy/melawy-check-reboot-required/01_sign.sh rename to MELAWY/Melawy/melawy-check-reboot-required/01_sign.sh diff --git a/Melawy/melawy-check-reboot-required/PKGBUILD b/MELAWY/Melawy/melawy-check-reboot-required/PKGBUILD similarity index 100% rename from Melawy/melawy-check-reboot-required/PKGBUILD rename to MELAWY/Melawy/melawy-check-reboot-required/PKGBUILD diff --git a/Melawy/melawy-check-reboot-required/README.md b/MELAWY/Melawy/melawy-check-reboot-required/README.md similarity index 100% rename from Melawy/melawy-check-reboot-required/README.md rename to MELAWY/Melawy/melawy-check-reboot-required/README.md diff --git a/Melawy/melawy-dracut-initramfs/.gitignore b/MELAWY/Melawy/melawy-dracut-initramfs/.gitignore similarity index 100% rename from Melawy/melawy-dracut-initramfs/.gitignore rename to MELAWY/Melawy/melawy-dracut-initramfs/.gitignore diff --git a/Melawy/melawy-skel-root/00_make.sh b/MELAWY/Melawy/melawy-dracut-initramfs/00_make.sh similarity index 100% rename from Melawy/melawy-skel-root/00_make.sh rename to MELAWY/Melawy/melawy-dracut-initramfs/00_make.sh diff --git a/Melawy/melawy-dracut-initramfs/01_sign.sh b/MELAWY/Melawy/melawy-dracut-initramfs/01_sign.sh similarity index 100% rename from Melawy/melawy-dracut-initramfs/01_sign.sh rename to MELAWY/Melawy/melawy-dracut-initramfs/01_sign.sh diff --git a/Melawy/melawy-dracut-initramfs/PKGBUILD b/MELAWY/Melawy/melawy-dracut-initramfs/PKGBUILD similarity index 100% rename from Melawy/melawy-dracut-initramfs/PKGBUILD rename to MELAWY/Melawy/melawy-dracut-initramfs/PKGBUILD diff --git a/Melawy/melawy-dracut-initramfs/README.md b/MELAWY/Melawy/melawy-dracut-initramfs/README.md similarity index 100% rename from Melawy/melawy-dracut-initramfs/README.md rename to MELAWY/Melawy/melawy-dracut-initramfs/README.md diff --git a/Melawy/melawy-dracut-ukify/.gitignore b/MELAWY/Melawy/melawy-dracut-ukify/.gitignore similarity index 100% rename from Melawy/melawy-dracut-ukify/.gitignore rename to MELAWY/Melawy/melawy-dracut-ukify/.gitignore diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh b/MELAWY/Melawy/melawy-dracut-ukify/00_make.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh rename to MELAWY/Melawy/melawy-dracut-ukify/00_make.sh diff --git a/Melawy/melawy-dracut-ukify/01_sign.sh b/MELAWY/Melawy/melawy-dracut-ukify/01_sign.sh similarity index 100% rename from Melawy/melawy-dracut-ukify/01_sign.sh rename to MELAWY/Melawy/melawy-dracut-ukify/01_sign.sh diff --git a/Melawy/melawy-dracut-ukify/PKGBUILD b/MELAWY/Melawy/melawy-dracut-ukify/PKGBUILD similarity index 100% rename from Melawy/melawy-dracut-ukify/PKGBUILD rename to MELAWY/Melawy/melawy-dracut-ukify/PKGBUILD diff --git a/Melawy/melawy-dracut-ukify/README.md b/MELAWY/Melawy/melawy-dracut-ukify/README.md similarity index 100% rename from Melawy/melawy-dracut-ukify/README.md rename to MELAWY/Melawy/melawy-dracut-ukify/README.md diff --git a/Melawy/melawy-etc-skel-kvantum/.gitignore b/MELAWY/Melawy/melawy-etc-skel-kvantum/.gitignore similarity index 100% rename from Melawy/melawy-etc-skel-kvantum/.gitignore rename to MELAWY/Melawy/melawy-etc-skel-kvantum/.gitignore diff --git a/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh b/MELAWY/Melawy/melawy-etc-skel-kvantum/00_make.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-Menu11/00_make.sh rename to MELAWY/Melawy/melawy-etc-skel-kvantum/00_make.sh diff --git a/Melawy/melawy-etc-skel-kvantum/01_sign.sh b/MELAWY/Melawy/melawy-etc-skel-kvantum/01_sign.sh similarity index 100% rename from Melawy/melawy-etc-skel-kvantum/01_sign.sh rename to MELAWY/Melawy/melawy-etc-skel-kvantum/01_sign.sh diff --git a/Melawy/melawy-etc-skel-kvantum/PKGBUILD b/MELAWY/Melawy/melawy-etc-skel-kvantum/PKGBUILD similarity index 99% rename from Melawy/melawy-etc-skel-kvantum/PKGBUILD rename to MELAWY/Melawy/melawy-etc-skel-kvantum/PKGBUILD index 2e70913..e291c3e 100644 --- a/Melawy/melawy-etc-skel-kvantum/PKGBUILD +++ b/MELAWY/Melawy/melawy-etc-skel-kvantum/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.17 +pkgver=1.22 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Melawy/melawy-etc-skel-kvantum/README.md b/MELAWY/Melawy/melawy-etc-skel-kvantum/README.md similarity index 100% rename from Melawy/melawy-etc-skel-kvantum/README.md rename to MELAWY/Melawy/melawy-etc-skel-kvantum/README.md diff --git a/Melawy/melawy-etc-skel-kvantum/ins.install b/MELAWY/Melawy/melawy-etc-skel-kvantum/ins.install similarity index 100% rename from Melawy/melawy-etc-skel-kvantum/ins.install rename to MELAWY/Melawy/melawy-etc-skel-kvantum/ins.install diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/.gitignore b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/.gitignore similarity index 100% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/.gitignore rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/.gitignore diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/00_make.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/00_make.sh diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/01_sign.sh b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/01_sign.sh similarity index 100% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/01_sign.sh rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/01_sign.sh diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD similarity index 99% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD index 2e70913..e291c3e 100644 --- a/Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD +++ b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.17 +pkgver=1.22 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/README.md b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/README.md similarity index 100% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/README.md rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/README.md diff --git a/Melawy/melawy-etc-skel-std-powerman-kvantum/ins.install b/MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/ins.install similarity index 100% rename from Melawy/melawy-etc-skel-std-powerman-kvantum/ins.install rename to MELAWY/Melawy/melawy-etc-skel-std-powerman-kvantum/ins.install diff --git a/Melawy/melawy-linux-keyring/.gitignore b/MELAWY/Melawy/melawy-linux-keyring/.gitignore similarity index 100% rename from Melawy/melawy-linux-keyring/.gitignore rename to MELAWY/Melawy/melawy-linux-keyring/.gitignore diff --git a/Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh b/MELAWY/Melawy/melawy-linux-keyring/00_make.sh similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh rename to MELAWY/Melawy/melawy-linux-keyring/00_make.sh diff --git a/Melawy/melawy-linux-keyring/01_sign.sh b/MELAWY/Melawy/melawy-linux-keyring/01_sign.sh similarity index 100% rename from Melawy/melawy-linux-keyring/01_sign.sh rename to MELAWY/Melawy/melawy-linux-keyring/01_sign.sh diff --git a/Melawy/melawy-linux-keyring/PKGBUILD b/MELAWY/Melawy/melawy-linux-keyring/PKGBUILD similarity index 98% rename from Melawy/melawy-linux-keyring/PKGBUILD rename to MELAWY/Melawy/melawy-linux-keyring/PKGBUILD index 8b16931..19d97c5 100644 --- a/Melawy/melawy-linux-keyring/PKGBUILD +++ b/MELAWY/Melawy/melawy-linux-keyring/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/Melawy/melawy-linux-keyring/README.md b/MELAWY/Melawy/melawy-linux-keyring/README.md similarity index 100% rename from Melawy/melawy-linux-keyring/README.md rename to MELAWY/Melawy/melawy-linux-keyring/README.md diff --git a/MELAWY/Melawy/melawy-linux-keyring/ins.install b/MELAWY/Melawy/melawy-linux-keyring/ins.install new file mode 100644 index 0000000..d7af51b --- /dev/null +++ b/MELAWY/Melawy/melawy-linux-keyring/ins.install @@ -0,0 +1,11 @@ +post_install() { + pacman-key --init + pacman-key --add /usr/share/pacman/keyrings/melawy-linux.gpg + pacman-key --lsign-key BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 + pacman-key --lsign-key B175815513971572FE7B1557CEC07AC8FF64DA4B + pacman-key --populate +} + +post_upgrade() { + post_install +} diff --git a/Melawy/melawy-linux-keyring/ins.install b/MELAWY/Melawy/melawy-linux-keyring/old_ins.install similarity index 100% rename from Melawy/melawy-linux-keyring/ins.install rename to MELAWY/Melawy/melawy-linux-keyring/old_ins.install diff --git a/Melawy/melawy-linux-mirrorlist/.gitignore b/MELAWY/Melawy/melawy-linux-mirrorlist/.gitignore similarity index 100% rename from Melawy/melawy-linux-mirrorlist/.gitignore rename to MELAWY/Melawy/melawy-linux-mirrorlist/.gitignore diff --git a/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh b/MELAWY/Melawy/melawy-linux-mirrorlist/00_make.sh similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh rename to MELAWY/Melawy/melawy-linux-mirrorlist/00_make.sh diff --git a/Melawy/melawy-linux-mirrorlist/01_sign.sh b/MELAWY/Melawy/melawy-linux-mirrorlist/01_sign.sh similarity index 100% rename from Melawy/melawy-linux-mirrorlist/01_sign.sh rename to MELAWY/Melawy/melawy-linux-mirrorlist/01_sign.sh diff --git a/Melawy/melawy-linux-mirrorlist/LICENSE b/MELAWY/Melawy/melawy-linux-mirrorlist/LICENSE similarity index 100% rename from Melawy/melawy-linux-mirrorlist/LICENSE rename to MELAWY/Melawy/melawy-linux-mirrorlist/LICENSE diff --git a/Melawy/melawy-linux-mirrorlist/PKGBUILD b/MELAWY/Melawy/melawy-linux-mirrorlist/PKGBUILD similarity index 100% rename from Melawy/melawy-linux-mirrorlist/PKGBUILD rename to MELAWY/Melawy/melawy-linux-mirrorlist/PKGBUILD diff --git a/Melawy/melawy-linux-mirrorlist/README.md b/MELAWY/Melawy/melawy-linux-mirrorlist/README.md similarity index 100% rename from Melawy/melawy-linux-mirrorlist/README.md rename to MELAWY/Melawy/melawy-linux-mirrorlist/README.md diff --git a/Melawy/melawy-refind-menu-generator/.gitignore b/MELAWY/Melawy/melawy-refind-menu-generator/.gitignore similarity index 100% rename from Melawy/melawy-refind-menu-generator/.gitignore rename to MELAWY/Melawy/melawy-refind-menu-generator/.gitignore diff --git a/Updater/melawy-arch-linux-updater/00_make.sh b/MELAWY/Melawy/melawy-refind-menu-generator/00_make.sh similarity index 100% rename from Updater/melawy-arch-linux-updater/00_make.sh rename to MELAWY/Melawy/melawy-refind-menu-generator/00_make.sh diff --git a/Melawy/melawy-refind-menu-generator/01_sign.sh b/MELAWY/Melawy/melawy-refind-menu-generator/01_sign.sh similarity index 100% rename from Melawy/melawy-refind-menu-generator/01_sign.sh rename to MELAWY/Melawy/melawy-refind-menu-generator/01_sign.sh diff --git a/MELAWY/Melawy/melawy-refind-menu-generator/PKGBUILD b/MELAWY/Melawy/melawy-refind-menu-generator/PKGBUILD new file mode 100644 index 0000000..6321748 --- /dev/null +++ b/MELAWY/Melawy/melawy-refind-menu-generator/PKGBUILD @@ -0,0 +1,35 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=1.32 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +url="https://git.melawy.ru/Core/$_gitname" +arch=("any") +license=("AGPL3") +depends=("refind") +optdepends=("melawy-dracut-ukify" "melawy-dracut-initramfs") +makedepends=("git") +backup=() +provides=("${pkgname}") +conflicts=("${pkgname}") +source=("git+$url.git") +backup=("etc/refind-menu-generator/theme.conf" "etc/refind-menu-generator/menu-template.conf") +sha256sums=("SKIP") +validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') + +# pkgver() { +# cd "$srcdir/$_gitname" +# printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" +# } + +pkgver() { + cd "$srcdir/$_gitname" + printf "1.%s" "$(git rev-list --count HEAD)" +} + +package() { + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/etc" "$pkgdir/" + cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/" +} diff --git a/Melawy/melawy-refind-menu-generator/README.md b/MELAWY/Melawy/melawy-refind-menu-generator/README.md similarity index 100% rename from Melawy/melawy-refind-menu-generator/README.md rename to MELAWY/Melawy/melawy-refind-menu-generator/README.md diff --git a/Melawy/melawy-skel-liveuser/.gitignore b/MELAWY/Melawy/melawy-skel-liveuser/.gitignore similarity index 100% rename from Melawy/melawy-skel-liveuser/.gitignore rename to MELAWY/Melawy/melawy-skel-liveuser/.gitignore diff --git a/Updater/melawy-pamac-helper/00_make.sh b/MELAWY/Melawy/melawy-skel-liveuser/00_make.sh similarity index 100% rename from Updater/melawy-pamac-helper/00_make.sh rename to MELAWY/Melawy/melawy-skel-liveuser/00_make.sh diff --git a/Melawy/melawy-skel-liveuser/01_sign.sh b/MELAWY/Melawy/melawy-skel-liveuser/01_sign.sh similarity index 100% rename from Melawy/melawy-skel-liveuser/01_sign.sh rename to MELAWY/Melawy/melawy-skel-liveuser/01_sign.sh diff --git a/Melawy/melawy-skel-liveuser/PKGBUILD b/MELAWY/Melawy/melawy-skel-liveuser/PKGBUILD similarity index 91% rename from Melawy/melawy-skel-liveuser/PKGBUILD rename to MELAWY/Melawy/melawy-skel-liveuser/PKGBUILD index d369cb8..5761972 100644 --- a/Melawy/melawy-skel-liveuser/PKGBUILD +++ b/MELAWY/Melawy/melawy-skel-liveuser/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.23 +pkgver=1.33 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") @@ -21,7 +21,7 @@ conflicts=("${pkgname}") options=() source=("git+$url.git") sha256sums=("SKIP") -validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8") +validpgpkeys=("BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8" "B175815513971572FE7B1557CEC07AC8FF64DA4B") # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Melawy/melawy-skel-liveuser/README.md b/MELAWY/Melawy/melawy-skel-liveuser/README.md similarity index 100% rename from Melawy/melawy-skel-liveuser/README.md rename to MELAWY/Melawy/melawy-skel-liveuser/README.md diff --git a/Melawy/melawy-skel-liveuser/ins.install b/MELAWY/Melawy/melawy-skel-liveuser/ins.install similarity index 82% rename from Melawy/melawy-skel-liveuser/ins.install rename to MELAWY/Melawy/melawy-skel-liveuser/ins.install index f31e9ae..a48e8b3 100644 --- a/Melawy/melawy-skel-liveuser/ins.install +++ b/MELAWY/Melawy/melawy-skel-liveuser/ins.install @@ -3,7 +3,7 @@ post_upgrade() { mkdir -p /home/liveuser fi cp -vrT --no-preserve=ownership "/usr/share/skel-liveuser/" "/home/liveuser/" - chown -Rh 1000:1000 /home/liveuser + chown -Rh liveuser:users /home/liveuser } post_install() { diff --git a/Melawy/melawy-skel-root/.gitignore b/MELAWY/Melawy/melawy-skel-root/.gitignore similarity index 100% rename from Melawy/melawy-skel-root/.gitignore rename to MELAWY/Melawy/melawy-skel-root/.gitignore diff --git a/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh b/MELAWY/Melawy/melawy-skel-root/00_make.sh similarity index 100% rename from Updater/melawy-plasma-plasmoid-archupdate/00_make.sh rename to MELAWY/Melawy/melawy-skel-root/00_make.sh diff --git a/Melawy/melawy-skel-root/01_sign.sh b/MELAWY/Melawy/melawy-skel-root/01_sign.sh similarity index 100% rename from Melawy/melawy-skel-root/01_sign.sh rename to MELAWY/Melawy/melawy-skel-root/01_sign.sh diff --git a/Melawy/melawy-skel-root/PKGBUILD b/MELAWY/Melawy/melawy-skel-root/PKGBUILD similarity index 99% rename from Melawy/melawy-skel-root/PKGBUILD rename to MELAWY/Melawy/melawy-skel-root/PKGBUILD index bc79b3e..0df6f05 100644 --- a/Melawy/melawy-skel-root/PKGBUILD +++ b/MELAWY/Melawy/melawy-skel-root/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.23 +pkgver=1.28 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=("any") diff --git a/Melawy/melawy-skel-root/README.md b/MELAWY/Melawy/melawy-skel-root/README.md similarity index 100% rename from Melawy/melawy-skel-root/README.md rename to MELAWY/Melawy/melawy-skel-root/README.md diff --git a/Melawy/melawy-skel-root/ins.install b/MELAWY/Melawy/melawy-skel-root/ins.install similarity index 100% rename from Melawy/melawy-skel-root/ins.install rename to MELAWY/Melawy/melawy-skel-root/ins.install diff --git a/MELAWY/Melawy/move_to_repo.sh b/MELAWY/Melawy/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Melawy/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/MELAWY/Melawy/pwd.txt b/MELAWY/Melawy/pwd.txt new file mode 100644 index 0000000..3153c29 --- /dev/null +++ b/MELAWY/Melawy/pwd.txt @@ -0,0 +1 @@ +/data/github/active/Melawy/PKGBUILD/MELAWY/Melawy \ No newline at end of file diff --git a/MELAWY/Menu/clean.sh b/MELAWY/Menu/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Menu/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Menu/make.sh b/MELAWY/Menu/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Menu/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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-DittoMenu/.gitignore b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/.gitignore similarity index 100% rename from Menu/melawy-plasma-plasmoid-DittoMenu/.gitignore rename to MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/.gitignore diff --git a/Installer/melawy-calamares-qt5/00_make.sh b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh similarity index 88% rename from Installer/melawy-calamares-qt5/00_make.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh index 4b80191..122f2f7 100755 --- a/Installer/melawy-calamares-qt5/00_make.sh +++ b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/00_make.sh @@ -22,6 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/01_sign.sh b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/01_sign.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-DittoMenu/01_sign.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/01_sign.sh diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD similarity index 100% rename from Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD rename to MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/PKGBUILD diff --git a/Menu/melawy-plasma-plasmoid-DittoMenu/README.md b/MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/README.md similarity index 100% rename from Menu/melawy-plasma-plasmoid-DittoMenu/README.md rename to MELAWY/Menu/melawy-plasma-plasmoid-DittoMenu/README.md diff --git a/Menu/melawy-plasma-plasmoid-Menu11/.gitignore b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/.gitignore similarity index 100% rename from Menu/melawy-plasma-plasmoid-Menu11/.gitignore rename to MELAWY/Menu/melawy-plasma-plasmoid-Menu11/.gitignore diff --git a/Installer/melawy-calamares-qt6/00_make.sh b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh similarity index 88% rename from Installer/melawy-calamares-qt6/00_make.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh index 4b80191..122f2f7 100755 --- a/Installer/melawy-calamares-qt6/00_make.sh +++ b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/00_make.sh @@ -22,6 +22,4 @@ do fi done -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-Menu11/01_sign.sh b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/01_sign.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-Menu11/01_sign.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-Menu11/01_sign.sh diff --git a/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD similarity index 100% rename from Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD rename to MELAWY/Menu/melawy-plasma-plasmoid-Menu11/PKGBUILD diff --git a/Menu/melawy-plasma-plasmoid-Menu11/README.md b/MELAWY/Menu/melawy-plasma-plasmoid-Menu11/README.md similarity index 100% rename from Menu/melawy-plasma-plasmoid-Menu11/README.md rename to MELAWY/Menu/melawy-plasma-plasmoid-Menu11/README.md diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/.gitignore b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/.gitignore similarity index 100% rename from Menu/melawy-plasma-plasmoid-OnzeMenuKDE/.gitignore rename to MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/.gitignore diff --git a/Design/Melawy/melawy-purple-light-cursors/00_make.sh b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh similarity index 82% rename from Design/Melawy/melawy-purple-light-cursors/00_make.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh index 30b8975..122f2f7 100755 --- a/Design/Melawy/melawy-purple-light-cursors/00_make.sh +++ b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/00_make.sh @@ -22,7 +22,4 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - echo "Ready" diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/01_sign.sh b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/01_sign.sh similarity index 100% rename from Menu/melawy-plasma-plasmoid-OnzeMenuKDE/01_sign.sh rename to MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/01_sign.sh diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD similarity index 100% rename from Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD rename to MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/PKGBUILD diff --git a/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/README.md b/MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/README.md similarity index 100% rename from Menu/melawy-plasma-plasmoid-OnzeMenuKDE/README.md rename to MELAWY/Menu/melawy-plasma-plasmoid-OnzeMenuKDE/README.md diff --git a/MELAWY/Menu/move_to_repo.sh b/MELAWY/Menu/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Menu/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Menu/pwd.txt b/MELAWY/Menu/pwd.txt similarity index 100% rename from Menu/pwd.txt rename to MELAWY/Menu/pwd.txt diff --git a/MELAWY/Plasmoids/clean.sh b/MELAWY/Plasmoids/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Plasmoids/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Plasmoids/make.sh b/MELAWY/Plasmoids/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Plasmoids/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/melawy-plasma-plasmoid-presentwindows/.gitignore b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/.gitignore diff --git a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh similarity index 82% rename from Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh index 30b8975..122f2f7 100755 --- a/Design/Melawy/melawy-purple-dark-default-cursors/00_make.sh +++ b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/00_make.sh @@ -22,7 +22,4 @@ do fi done -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make" -t 10000 "finished" "$(date '+%Y.%m.%d %H:%M:%S')" - echo "Ready" diff --git a/Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/01_sign.sh diff --git a/Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/PKGBUILD diff --git a/Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md b/MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-presentwindows/README.md diff --git a/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/.gitignore diff --git a/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/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/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/01_sign.sh diff --git a/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/PKGBUILD diff --git a/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md b/MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md similarity index 100% rename from Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md rename to MELAWY/Plasmoids/melawy-plasma-plasmoid-win7showdesktop/README.md diff --git a/MELAWY/Plasmoids/move_to_repo.sh b/MELAWY/Plasmoids/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Plasmoids/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Plasmoids/pwd.txt b/MELAWY/Plasmoids/pwd.txt similarity index 100% rename from Plasmoids/pwd.txt rename to MELAWY/Plasmoids/pwd.txt diff --git a/MELAWY/Updater/clean.sh b/MELAWY/Updater/clean.sh new file mode 100755 index 0000000..72f53ab --- /dev/null +++ b/MELAWY/Updater/clean.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" + +echo "Ready" diff --git a/MELAWY/Updater/make.sh b/MELAWY/Updater/make.sh new file mode 100755 index 0000000..c2b6957 --- /dev/null +++ b/MELAWY/Updater/make.sh @@ -0,0 +1,89 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +echo -n $( dirname -- "$( readlink -f -- "$0" )" ) > pwd.txt + +CWD=$(cat pwd.txt) + +dir_list=$(find . -mindepth 2 -maxdepth 4 -name "PKGBUILD" -type f) + +for i in ${dir_list[@]} +do + path="$(dirname $i)" + full_path="$CWD/$path" + + echo "$full_path" + cd "$full_path" + + git_dir="$(find . -mindepth 1 -maxdepth 1 -name "$(basename $full_path)" -type d)" + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + make_file=$(find . -mindepth 1 -maxdepth 1 -name "*make*\.sh" -type f) + if [ -f "$make_file" ]; then + echo "bash $make_file" + bash "$make_file" + else + makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force + + for i in *.pkg.tar.xz; + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + unset make_file + + pkg_file=$(find . -mindepth 1 -maxdepth 1 -name "*.pkg.tar.*" -type f) + sig_file="${pkg_file}.sig" + + if [ ! -f "$sig_file" ]; then + for i in *.pkg.tar.xz + do + if [ -f "${i}" ]; then + if [ -f "$i.sig" ]; then + echo "Удаление подписи $i.sig" + rm -f $i.sig + fi + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" + fi + done + fi + + if [ -n "$git_dir" ] && [ -d "$git_dir" ]; then + echo "rm -rf $git_dir" + rm -rf "$git_dir" + fi + + if [ -d "$full_path/src" ]; then + rm -rf "$full_path/src" + fi + + if [ -d "$full_path/pkg" ]; then + rm -rf "$full_path/pkg" + fi + + cd "$CWD" +done + +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/.gitignore b/MELAWY/Updater/melawy-arch-linux-updater/.gitignore similarity index 100% rename from Updater/melawy-arch-linux-updater/.gitignore rename to MELAWY/Updater/melawy-arch-linux-updater/.gitignore diff --git a/MELAWY/Updater/melawy-arch-linux-updater/00_make.sh b/MELAWY/Updater/melawy-arch-linux-updater/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/MELAWY/Updater/melawy-arch-linux-updater/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/Updater/melawy-arch-linux-updater/01_sign.sh b/MELAWY/Updater/melawy-arch-linux-updater/01_sign.sh similarity index 100% rename from Updater/melawy-arch-linux-updater/01_sign.sh rename to MELAWY/Updater/melawy-arch-linux-updater/01_sign.sh diff --git a/Updater/melawy-arch-linux-updater/PKGBUILD b/MELAWY/Updater/melawy-arch-linux-updater/PKGBUILD similarity index 99% rename from Updater/melawy-arch-linux-updater/PKGBUILD rename to MELAWY/Updater/melawy-arch-linux-updater/PKGBUILD index b458ad3..5c1c741 100644 --- a/Updater/melawy-arch-linux-updater/PKGBUILD +++ b/MELAWY/Updater/melawy-arch-linux-updater/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.18 +pkgver=1.20 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') diff --git a/Updater/melawy-arch-linux-updater/README.md b/MELAWY/Updater/melawy-arch-linux-updater/README.md similarity index 100% rename from Updater/melawy-arch-linux-updater/README.md rename to MELAWY/Updater/melawy-arch-linux-updater/README.md diff --git a/Updater/melawy-pamac-helper/.gitignore b/MELAWY/Updater/melawy-pamac-helper/.gitignore similarity index 100% rename from Updater/melawy-pamac-helper/.gitignore rename to MELAWY/Updater/melawy-pamac-helper/.gitignore diff --git a/MELAWY/Updater/melawy-pamac-helper/00_make.sh b/MELAWY/Updater/melawy-pamac-helper/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/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/Updater/melawy-pamac-helper/01_sign.sh b/MELAWY/Updater/melawy-pamac-helper/01_sign.sh similarity index 100% rename from Updater/melawy-pamac-helper/01_sign.sh rename to MELAWY/Updater/melawy-pamac-helper/01_sign.sh diff --git a/Updater/melawy-pamac-helper/LICENSE b/MELAWY/Updater/melawy-pamac-helper/LICENSE similarity index 100% rename from Updater/melawy-pamac-helper/LICENSE rename to MELAWY/Updater/melawy-pamac-helper/LICENSE diff --git a/Updater/melawy-pamac-helper/PKGBUILD b/MELAWY/Updater/melawy-pamac-helper/PKGBUILD similarity index 85% rename from Updater/melawy-pamac-helper/PKGBUILD rename to MELAWY/Updater/melawy-pamac-helper/PKGBUILD index 0bc3bf9..396fdfd 100644 --- a/Updater/melawy-pamac-helper/PKGBUILD +++ b/MELAWY/Updater/melawy-pamac-helper/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") -pkgver=1.2 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') url="https://git.melawy.ru/Updater/$_gitname" license=('AGPL') -depends=("pacman") +depends=("pacman" "pamac") optdepends=() makedepends=("git") backup=() @@ -29,9 +29,9 @@ pkgver() { } package() { - install -d "$pkgdir/usr/local/bin/" + install -d "$pkgdir/usr/bin/" install -d "$pkgdir/usr/share/applications/" - install -Dm755 "${srcdir}/$_gitname/pamac" "$pkgdir/usr/local/bin/" + install -Dm755 "${srcdir}/$_gitname/pamac-helper" "$pkgdir/usr/bin/" install -Dm644 "${srcdir}/$_gitname/pamac.desktop" "$pkgdir/usr/share/applications/" } diff --git a/Updater/melawy-pamac-helper/README.md b/MELAWY/Updater/melawy-pamac-helper/README.md similarity index 100% rename from Updater/melawy-pamac-helper/README.md rename to MELAWY/Updater/melawy-pamac-helper/README.md diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/FETCH_HEAD b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/FETCH_HEAD new file mode 100644 index 0000000..d9afa06 --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/FETCH_HEAD @@ -0,0 +1 @@ +85fc794d6f6531d71c75911b07715fb66a98560f not-for-merge branch 'main' of https://git.melawy.ru/Updater/melawy-pamac-helper diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/HEAD b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/HEAD similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/HEAD rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/HEAD diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/config b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/config similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/config rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/config diff --git a/Core/chwd/chwd/description b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/description similarity index 100% rename from Core/chwd/chwd/description rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/description diff --git a/Core/chwd/chwd/hooks/applypatch-msg.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/applypatch-msg.sample similarity index 100% rename from Core/chwd/chwd/hooks/applypatch-msg.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/applypatch-msg.sample diff --git a/Core/chwd/chwd/hooks/commit-msg.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/commit-msg.sample similarity index 100% rename from Core/chwd/chwd/hooks/commit-msg.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/commit-msg.sample diff --git a/Core/chwd/chwd/hooks/fsmonitor-watchman.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/fsmonitor-watchman.sample similarity index 100% rename from Core/chwd/chwd/hooks/fsmonitor-watchman.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/fsmonitor-watchman.sample diff --git a/Core/chwd/chwd/hooks/post-update.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/post-update.sample similarity index 100% rename from Core/chwd/chwd/hooks/post-update.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/post-update.sample diff --git a/Core/chwd/chwd/hooks/pre-applypatch.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-applypatch.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-applypatch.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-applypatch.sample diff --git a/Core/chwd/chwd/hooks/pre-commit.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-commit.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-commit.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-commit.sample diff --git a/Core/chwd/chwd/hooks/pre-merge-commit.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-merge-commit.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-merge-commit.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-merge-commit.sample diff --git a/Core/chwd/chwd/hooks/pre-push.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-push.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-push.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-push.sample diff --git a/Core/chwd/chwd/hooks/pre-rebase.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-rebase.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-rebase.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-rebase.sample diff --git a/Core/chwd/chwd/hooks/pre-receive.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-receive.sample similarity index 100% rename from Core/chwd/chwd/hooks/pre-receive.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-receive.sample diff --git a/Core/chwd/chwd/hooks/prepare-commit-msg.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/prepare-commit-msg.sample similarity index 100% rename from Core/chwd/chwd/hooks/prepare-commit-msg.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/prepare-commit-msg.sample diff --git a/Core/chwd/chwd/hooks/push-to-checkout.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/push-to-checkout.sample similarity index 100% rename from Core/chwd/chwd/hooks/push-to-checkout.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/push-to-checkout.sample diff --git a/Core/chwd/chwd/hooks/sendemail-validate.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/sendemail-validate.sample similarity index 100% rename from Core/chwd/chwd/hooks/sendemail-validate.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/sendemail-validate.sample diff --git a/Core/chwd/chwd/hooks/update.sample b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/update.sample similarity index 100% rename from Core/chwd/chwd/hooks/update.sample rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/update.sample diff --git a/Core/chwd/chwd/info/exclude b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/info/exclude similarity index 100% rename from Core/chwd/chwd/info/exclude rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/info/exclude diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/26/972a886b6d68ffee4468873b1c229c50de1c14 b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/26/972a886b6d68ffee4468873b1c229c50de1c14 new file mode 100644 index 0000000..15cd64e Binary files /dev/null and b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/26/972a886b6d68ffee4468873b1c229c50de1c14 differ diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/3b/119f511c32b7f2ab69c7669636bb6f33ff04e0 b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/3b/119f511c32b7f2ab69c7669636bb6f33ff04e0 new file mode 100644 index 0000000..57c54fa --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/3b/119f511c32b7f2ab69c7669636bb6f33ff04e0 @@ -0,0 +1,2 @@ +xA +0a9EBI&W@D -!z/-LMVEtJEP!a{@vEITt~/x VB 1ؘzYLTYDNF"WiRca0AcԮ&cej~|P \ No newline at end of file diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/81/7b18f4f2590d1ecad7ba80997bc8f7ce64e6df b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/81/7b18f4f2590d1ecad7ba80997bc8f7ce64e6df new file mode 100644 index 0000000..477ad96 Binary files /dev/null and b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/81/7b18f4f2590d1ecad7ba80997bc8f7ce64e6df differ diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/85/fc794d6f6531d71c75911b07715fb66a98560f b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/85/fc794d6f6531d71c75911b07715fb66a98560f new file mode 100644 index 0000000..98a9844 --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/85/fc794d6f6531d71c75911b07715fb66a98560f @@ -0,0 +1,2 @@ +xM +0@a9EBMq t?I'Zhl #Z.ޘ5 G 0[!xT:f#XU,NltES˜=bD)a1 4DN#F0ʷWiRRyP:uV]c6XNN \ No newline at end of file diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/b1/33c8127f958c337b1010ed9316106c48e06b07 b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/b1/33c8127f958c337b1010ed9316106c48e06b07 new file mode 100644 index 0000000..600cda9 --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/b1/33c8127f958c337b1010ed9316106c48e06b07 @@ -0,0 +1,5 @@ +xR]k@ + +y8M0"!}Xʩ}ϒBfwfPՅ*(!f+/4YdS ,#q>}I(bZ o嫙7M(#tVށ039$f\{Uly-UFGLY|>ju[px3j]o&k{~qx԰)ca]=A=i~؛HzJKٕؐ.IlVyKn=U^^\//'&ȟM?n~ + \ No newline at end of file diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/cc/2dfdee5e6952be0d22b6425d3f4b73715e2d6a b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/cc/2dfdee5e6952be0d22b6425d3f4b73715e2d6a new file mode 100644 index 0000000..6c3d9cc Binary files /dev/null and b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/cc/2dfdee5e6952be0d22b6425d3f4b73715e2d6a differ diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.idx b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.idx similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.idx rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.idx diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.pack b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.pack similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.pack rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.pack diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.rev b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.rev similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.rev rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/objects/pack/pack-269c90a63ee0309906f44e4c46c886288dd3372b.rev diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/packed-refs b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/packed-refs similarity index 100% rename from Updater/melawy-pamac-helper/melawy-pamac-helper/packed-refs rename to MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/packed-refs diff --git a/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/refs/heads/main b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/refs/heads/main new file mode 100644 index 0000000..4b86f4f --- /dev/null +++ b/MELAWY/Updater/melawy-pamac-helper/melawy-pamac-helper/refs/heads/main @@ -0,0 +1 @@ +85fc794d6f6531d71c75911b07715fb66a98560f diff --git a/Updater/melawy-plasma-plasmoid-archupdate/.gitignore b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/.gitignore similarity index 100% rename from Updater/melawy-plasma-plasmoid-archupdate/.gitignore rename to MELAWY/Updater/melawy-plasma-plasmoid-archupdate/.gitignore diff --git a/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/00_make.sh new file mode 100755 index 0000000..122f2f7 --- /dev/null +++ b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/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/Updater/melawy-plasma-plasmoid-archupdate/01_sign.sh b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/01_sign.sh similarity index 100% rename from Updater/melawy-plasma-plasmoid-archupdate/01_sign.sh rename to MELAWY/Updater/melawy-plasma-plasmoid-archupdate/01_sign.sh diff --git a/Updater/melawy-plasma-plasmoid-archupdate/PKGBUILD b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/PKGBUILD similarity index 100% rename from Updater/melawy-plasma-plasmoid-archupdate/PKGBUILD rename to MELAWY/Updater/melawy-plasma-plasmoid-archupdate/PKGBUILD diff --git a/Updater/melawy-plasma-plasmoid-archupdate/README.md b/MELAWY/Updater/melawy-plasma-plasmoid-archupdate/README.md similarity index 100% rename from Updater/melawy-plasma-plasmoid-archupdate/README.md rename to MELAWY/Updater/melawy-plasma-plasmoid-archupdate/README.md diff --git a/MELAWY/Updater/move_to_repo.sh b/MELAWY/Updater/move_to_repo.sh new file mode 100755 index 0000000..c565e13 --- /dev/null +++ b/MELAWY/Updater/move_to_repo.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +REPO="/data/github/active/Melawy/REPO/melawy/x86_64/" + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -exec mv -v {} $REPO \; +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -exec mv -v {} $REPO \; + +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.xz" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.pkg.tar.zst" -delete +find . -mindepth 1 -maxdepth 3 -type f -name "*.sig" -delete + +echo "Ready" +sleep 5 +kill $(ps x | grep konsole | grep $0 | awk '{print $1}') diff --git a/Updater/pwd.txt b/MELAWY/Updater/pwd.txt similarity index 100% rename from Updater/pwd.txt rename to MELAWY/Updater/pwd.txt diff --git a/Melawy/make.sh b/Melawy/make.sh deleted file mode 100755 index f18c58b..0000000 --- a/Melawy/make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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 - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Melawy/melawy-refind-menu-generator/PKGBUILD b/Melawy/melawy-refind-menu-generator/PKGBUILD deleted file mode 100644 index 2f90333..0000000 --- a/Melawy/melawy-refind-menu-generator/PKGBUILD +++ /dev/null @@ -1,46 +0,0 @@ -# Maintainer: Valeria Fadeeva - -_gitname="$(basename $(pwd))" -pkgname=("$_gitname") -pkgver=1.29 -pkgrel=1 -pkgdesc="$(head -n 2 README.md | tail -n 1)" -url="https://git.melawy.ru/Core/$_gitname" -arch=("any") -license=("AGPL3") -depends=("refind") -optdepends=("melawy-dracut-ukify" "melawy-dracut-initramfs") -makedepends=("git") -backup=() -provides=("${pkgname}") -conflicts=("${pkgname}") -source=("git+$url.git") -backup=("etc/refind-menu-generator/theme.conf") -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() { -# install -Dm644 "${srcdir}/$_gitname/10-refind-menu-pre-install.hook" "${pkgdir}/usr/share/libalpm/hooks/10-refind-menu-pre-install.hook" -# install -Dm644 "${srcdir}/$_gitname/60-refind-menu-remove.hook" "${pkgdir}/usr/share/libalpm/hooks/60-refind-menu-remove.hook" -# install -Dm644 "${srcdir}/$_gitname/90-refind-menu-install.hook" "${pkgdir}/usr/share/libalpm/hooks/90-refind-menu-install.hook" -# install -dm755 "${pkgdir}/etc/refind-menu-generator" -# install -Dm644 "${srcdir}/$_gitname/refind.conf" "${pkgdir}/etc/refind-menu-generator/refind.conf" -# install -Dm644 "${srcdir}/$_gitname/menu-end.txt" "${pkgdir}/etc/refind-menu-generator/menu-end.txt" -# install -Dm644 "${srcdir}/$_gitname/menu-template.txt" "${pkgdir}/etc/refind-menu-generator/menu-template.txt" -# install -Dm644 "${srcdir}/$_gitname/menu-template-efi-first.txt" "${pkgdir}/etc/refind-menu-generator/menu-template-efi-first.txt" -# install -Dm644 "${srcdir}/$_gitname/menu-template-vmlinuz-first.txt" "${pkgdir}/etc/refind-menu-generator/menu-template-vmlinuz-first.txt" -# install -Dm755 "${srcdir}/$_gitname/refind-menu-generator" "${pkgdir}/usr/bin/refind-menu-generator" - - cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/etc" "$pkgdir/" - cp -vrf --no-dereference --preserve=links "$srcdir/$_gitname/usr" "$pkgdir/" -} diff --git a/Melawy/move_to_repo.sh b/Melawy/move_to_repo.sh deleted file mode 100755 index 488d7f5..0000000 --- a/Melawy/move_to_repo.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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/Melawy/pwd.txt b/Melawy/pwd.txt deleted file mode 100644 index a32715d..0000000 --- a/Melawy/pwd.txt +++ /dev/null @@ -1 +0,0 @@ -/data/github/active/Melawy/PKGBUILD-git.melawy.ru/Core \ No newline at end of file diff --git a/Menu/make.sh b/Menu/make.sh deleted file mode 100755 index f18c58b..0000000 --- a/Menu/make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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 - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Plasmoids/make.sh b/Plasmoids/make.sh deleted file mode 100755 index f18c58b..0000000 --- a/Plasmoids/make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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 - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Updater/make.sh b/Updater/make.sh deleted file mode 100755 index f18c58b..0000000 --- a/Updater/make.sh +++ /dev/null @@ -1,62 +0,0 @@ -#!/bin/bash - -REPO="/data/github/active/Melawy/REPO/melawy/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 - makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force - - for i in *.pkg.tar.zst; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - for i in *.pkg.tar.xz; - do - if [ -f "${i}" ]; then - echo "Удаление подписи $i.sig" - rm -f $i.sig - echo "Добавление подписи $i.sig" - gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" - fi - done - - package_file=$(ls -1 | grep -v "pkg.tar.zst.sig" | grep "pkg.tar.zst") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep -v "pkg.tar.xz.sig" | grep "pkg.tar.xz") - if [ -f "$CWD/$package_dir/$package_file" ]; then - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.xz.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - package_file=$(ls -1 | grep "pkg.tar.zst.sig") - if [ -f "$CWD/$package_dir/$package_file" ]; then - - mv -v $CWD/$package_dir/$package_file $REPO/ - fi - - cd $CWD -done - -echo "melawy" | beep -f 200 -l 250 -d 100 -r 1 -n -s -notify-send -a "$(basename $(pwd)): Make and Move to" -t 10000 "$REPO" "$(date '+%Y.%m.%d %H:%M:%S')" - -echo "Ready" diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/description b/Updater/melawy-pamac-helper/melawy-pamac-helper/description deleted file mode 100644 index 498b267..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/description +++ /dev/null @@ -1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. diff --git a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/applypatch-msg.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/applypatch-msg.sample deleted file mode 100755 index a5d7b84..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/applypatch-msg.sample +++ /dev/null @@ -1,15 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/commit-msg.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/commit-msg.sample deleted file mode 100755 index b58d118..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/commit-msg.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/fsmonitor-watchman.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/fsmonitor-watchman.sample deleted file mode 100755 index 23e856f..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/fsmonitor-watchman.sample +++ /dev/null @@ -1,174 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/post-update.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/post-update.sample deleted file mode 100755 index ec17ec1..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/post-update.sample +++ /dev/null @@ -1,8 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-applypatch.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-applypatch.sample deleted file mode 100755 index 4142082..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-applypatch.sample +++ /dev/null @@ -1,14 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-commit.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-commit.sample deleted file mode 100755 index e144712..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-commit.sample +++ /dev/null @@ -1,49 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-merge-commit.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-merge-commit.sample deleted file mode 100755 index 399eab1..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-merge-commit.sample +++ /dev/null @@ -1,13 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-push.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-push.sample deleted file mode 100755 index 4ce688d..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-push.sample +++ /dev/null @@ -1,53 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-rebase.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-rebase.sample deleted file mode 100755 index 6cbef5c..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-rebase.sample +++ /dev/null @@ -1,169 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-receive.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-receive.sample deleted file mode 100755 index a1fd29e..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/pre-receive.sample +++ /dev/null @@ -1,24 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/prepare-commit-msg.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/prepare-commit-msg.sample deleted file mode 100755 index 10fa14c..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/prepare-commit-msg.sample +++ /dev/null @@ -1,42 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/push-to-checkout.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/push-to-checkout.sample deleted file mode 100755 index af5a0c0..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/push-to-checkout.sample +++ /dev/null @@ -1,78 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/update.sample b/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/update.sample deleted file mode 100755 index c4d426b..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/hooks/update.sample +++ /dev/null @@ -1,128 +0,0 @@ -#!/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/Updater/melawy-pamac-helper/melawy-pamac-helper/info/exclude b/Updater/melawy-pamac-helper/melawy-pamac-helper/info/exclude deleted file mode 100644 index a5196d1..0000000 --- a/Updater/melawy-pamac-helper/melawy-pamac-helper/info/exclude +++ /dev/null @@ -1,6 +0,0 @@ -# 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/find.sh b/find.sh new file mode 100755 index 0000000..a237ea0 --- /dev/null +++ b/find.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +for i in $(find . -name "PKGBUILD"); do grep "git.melawy.ru" $i; done + +echo "Ready" diff --git a/СДЕЛАТЬ.txt b/СДЕЛАТЬ.txt deleted file mode 100644 index 05ed8a0..0000000 --- a/СДЕЛАТЬ.txt +++ /dev/null @@ -1,8 +0,0 @@ -предупреждение: ccache: установленная версия (4.8.3-1) новее, чем в cachyos (4.8-1) -предупреждение: fastfetch: установленная версия (2.2.3-1) новее, чем в cachyos (2.1.2-2) -предупреждение: ftl-sdk: установленная версия (0.10.1-3.2) новее, чем в melawy-3party (0.10.1-3) -предупреждение: kdsoap-ws-discovery-client: установленная версия (0.3.0-2) новее, чем в cachyos (git20200927-2.1) -предупреждение: kvantum-theme-nordic-git: установленная версия (2.2.0.r82.g38f284d-1) новее, чем в cachyos (2.2.0.r71.gff8165c-1) -предупреждение: profile-sync-daemon: установленная версия (1:6.50-1) новее, чем в cachyos (1:6.48-3) -предупреждение: python: установленная версия (3.11.6-1) новее, чем в cachyos (3.11.5-2) -