diff --git a/Core/dracut-initramfs/PKGBUILD b/Core/dracut-initramfs/PKGBUILD index d6ad9a4..8cd7b81 100644 --- a/Core/dracut-initramfs/PKGBUILD +++ b/Core/dracut-initramfs/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.10 +pkgver=1.13 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" arch=("any") license=("AGPL3") -depends=("dracut" "systemd" "python" "util-linux" "python-pefile") +depends=("dracut" "systemd" "refind" "python" "util-linux" "python-pefile") optdepends=() makedepends=("git") backup=() diff --git a/Core/dracut-ukify/PKGBUILD b/Core/dracut-ukify/PKGBUILD index 4d9e582..45fee91 100644 --- a/Core/dracut-ukify/PKGBUILD +++ b/Core/dracut-ukify/PKGBUILD @@ -2,13 +2,13 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.8 +pkgver=1.14 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" arch=("any") license=("AGPL3") -depends=("dracut" "systemd-ukify" "python" "util-linux" "python-pefile") +depends=("dracut" "systemd" "systemd-ukify" "refind" "python" "util-linux" "python-pefile") optdepends=("sbsigntools: secureboot support") makedepends=("git") backup=() diff --git a/Core/refind-menu-generator/PKGBUILD b/Core/refind-menu-generator/PKGBUILD index e0ad2d1..1186f31 100644 --- a/Core/refind-menu-generator/PKGBUILD +++ b/Core/refind-menu-generator/PKGBUILD @@ -2,14 +2,14 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.11 +pkgver=1.13 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" arch=("any") license=("AGPL3") depends=("refind") -optdepends=() +optdepends=("melawy-dracut-ukify" "melawy-dracut-initramfs") makedepends=("git") backup=() provides=("${pkgname}") diff --git a/Design/Fenek/refind-theme-fenek/PKGBUILD b/Design/Fenek/refind-theme-fenek/PKGBUILD index 0de9930..ec14d57 100644 --- a/Design/Fenek/refind-theme-fenek/PKGBUILD +++ b/Design/Fenek/refind-theme-fenek/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.1 +pkgver=1.3 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" @@ -21,7 +21,7 @@ validpgpkeys=('BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8') THEME_NAME="melawy-fenek" THEME_PATH="/usr/share/refind/themes" -install=$pkgname.install +install=ins.install # pkgver() { # cd "$srcdir/$_gitname" diff --git a/Design/Fenek/refind-theme-fenek/ins.install b/Design/Fenek/refind-theme-fenek/ins.install index fc43fda..fe584a4 100644 --- a/Design/Fenek/refind-theme-fenek/ins.install +++ b/Design/Fenek/refind-theme-fenek/ins.install @@ -73,7 +73,7 @@ post_remove() { echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" } -# Copied from https://github.com/jaltuna/sbmok/master/verify.sh +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh # Verify EFI System Partition __has_esp__() { __find_esp__ @@ -96,5 +96,12 @@ __find_esp__() { done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + if [ -z "$ESP" ]; then + ESP=$(grep -i "efi" /etc/fstab | awk '{print $2}') + if [ -z "$ESP" ]; then + exit 1 + fi + fi + readonly ESP } diff --git a/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD b/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD index 10210c9..09f3014 100644 --- a/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD +++ b/Design/Lera-Sugar/refind-theme-lera-sugar/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.7 +pkgver=1.9 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Design/Lera-Sugar/refind-theme-lera-sugar/ins.install b/Design/Lera-Sugar/refind-theme-lera-sugar/ins.install index dc4b2e3..9b547a1 100644 --- a/Design/Lera-Sugar/refind-theme-lera-sugar/ins.install +++ b/Design/Lera-Sugar/refind-theme-lera-sugar/ins.install @@ -73,7 +73,7 @@ post_remove() { echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" } -# Copied from https://github.com/jaltuna/sbmok/master/verify.sh +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh # Verify EFI System Partition __has_esp__() { __find_esp__ @@ -96,5 +96,12 @@ __find_esp__() { done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + if [ -z "$ESP" ]; then + ESP=$(grep -i "efi" /etc/fstab | awk '{print $2}') + if [ -z "$ESP" ]; then + exit 1 + fi + fi + readonly ESP } diff --git a/Design/Nier-A2/refind-theme-nier-a2/PKGBUILD b/Design/Nier-A2/refind-theme-nier-a2/PKGBUILD index bfbb36b..8bcf442 100644 --- a/Design/Nier-A2/refind-theme-nier-a2/PKGBUILD +++ b/Design/Nier-A2/refind-theme-nier-a2/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.2 +pkgver=1.4 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" url="https://git.melawy.ru/Melawy-Linux/$_gitname" diff --git a/Design/Nier-A2/refind-theme-nier-a2/ins.install b/Design/Nier-A2/refind-theme-nier-a2/ins.install index 7600d5f..bbf8a6c 100644 --- a/Design/Nier-A2/refind-theme-nier-a2/ins.install +++ b/Design/Nier-A2/refind-theme-nier-a2/ins.install @@ -73,7 +73,7 @@ post_remove() { echo "Theme uninstalled from ${REFIND_DIR}/themes/$THEME_NAME" } -# Copied from https://github.com/jaltuna/sbmok/master/verify.sh +# Copied from https://raw.githubusercontent.com/jaltuna/refind-theme-nord/main/setup.sh # Verify EFI System Partition __has_esp__() { __find_esp__ @@ -96,5 +96,12 @@ __find_esp__() { done <<<"$(fdisk -l 2>/dev/null | grep -i efi | cut -d " " -f 1)" + if [ -z "$ESP" ]; then + ESP=$(grep -i "efi" /etc/fstab | awk '{print $2}') + if [ -z "$ESP" ]; then + exit 1 + fi + fi + readonly ESP } diff --git a/Installer/melawy-calamares/PKGBUILD b/Installer/melawy-calamares/PKGBUILD index a066393..64a678a 100644 --- a/Installer/melawy-calamares/PKGBUILD +++ b/Installer/melawy-calamares/PKGBUILD @@ -4,18 +4,19 @@ _gitname="$(basename $(pwd))" pkgname=("$_gitname") release_name=$pkgname -pkgver=3.3.0.10974 +pkgver=3.3.0.10981 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') -url="https://git.melawy.ru/Melawy/$_gitname" +url="https://git.melawy.ru/Melawy-Linux/$_gitname" + license=('GPL3') -makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk' 'ninja' 'qt5-tools') +makedepends=('git' 'cmake' 'extra-cmake-modules' 'kpmcore' 'boost' 'python-jsonschema' 'python-pyaml' 'python-unidecode' 'gawk' 'ninja' 'qt5-tools' 'kdbusaddons') depends=( 'qt5-svg' 'qt5-webengine' 'yaml-cpp' 'networkmanager' 'upower' 'kcoreaddons' 'kconfig' 'ki18n' 'kservice' \ 'kwidgetsaddons' 'kpmcore' 'squashfs-tools' 'rsync' 'cryptsetup' 'qt5-xmlpatterns' 'doxygen' 'dmidecode' \ -'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt5' 'python' 'solid' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols' 'qt5-quickcontrols2' ) +'gptfdisk' 'hwinfo' 'kparts' 'polkit-qt5' 'python' 'solid' 'qt5-tools' 'boost-libs' 'libpwquality' 'ckbcomp' 'qt5-quickcontrols' 'qt5-quickcontrols2' 'kdbusaddons') provides=("calamares") conflicts=('calamares' 'calamares_current') diff --git a/Installer/melawy-welcome/00_make.sh b/Installer/melawy-welcome/00_make.sh new file mode 100755 index 0000000..d55d30b --- /dev/null +++ b/Installer/melawy-welcome/00_make.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +makepkg --syncdeps --asdeps --needed --noconfirm --clean --cleanbuild --force diff --git a/Installer/melawy-welcome/01_sign.sh b/Installer/melawy-welcome/01_sign.sh new file mode 100755 index 0000000..a0a1700 --- /dev/null +++ b/Installer/melawy-welcome/01_sign.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +for i in *.pkg.tar.zst; +do + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" +done + +for i in *.pkg.tar.xz; +do + echo "Удаление подписи $i.sig" + rm -f $i.sig + echo "Добавление подписи $i.sig" + gpg --detach-sign --local-user BC8B600E8DDA1F4CB77B10D2BA803A261A5EE6B8 --output "$i.sig" "$i" +done \ No newline at end of file diff --git a/Installer/melawy-welcome/PKGBUILD b/Installer/melawy-welcome/PKGBUILD new file mode 100644 index 0000000..529c7e8 --- /dev/null +++ b/Installer/melawy-welcome/PKGBUILD @@ -0,0 +1,58 @@ +# Maintainer: Valeria Fadeeva + +_gitname="$(basename $(pwd))" +pkgname=("$_gitname") +pkgver=0.10.1.199 +pkgrel=1 +pkgdesc="$(head -n 2 README.md | tail -n 1)" +arch=('x86_64') +url="https://git.melawy.ru/Melawy-Linux/$_gitname" +groups=('melawy') + +license=('GPL3') + +makedepends=('meson' 'git' 'mold' 'rustup' 'clang') + +depends=('gtk3' 'glib2') + +provides=("$_gitname") +conflicts=("$_gitname") + +options=(strip) +source=("git+$url.git") + +sha256sums=('SKIP') + +pkgver() { + cd "${srcdir}/${_gitname}/" + printf "0.10.1.%s" "$(git rev-list --count HEAD)" +} + +build() { + cd "${srcdir}/${_gitname}/" + + if ! rustc --version | grep nightly >/dev/null 2>&1; then + echo "Installing nightly compiler…" + rustup toolchain install nightly + rustup default nightly + fi + + _cpuCount=$(grep -c -w ^processor /proc/cpuinfo) + + export RUSTFLAGS="-Cembed-bitcode -C opt-level=3 -Ccodegen-units=1 -Clinker=clang -C link-arg=-flto -Clink-arg=-fuse-ld=/usr/bin/mold" + meson setup --buildtype=release --prefix=/usr build + + meson compile -C build --jobs $_cpuCount +} + +package() { + cd "${srcdir}/${_gitname}"/build + + export RUSTFLAGS="-Cembed-bitcode -C opt-level=3 -Ccodegen-units=1 -Clinker=clang -C link-arg=-flto -Clink-arg=-fuse-ld=/usr/bin/mold" + DESTDIR="${pkgdir}" meson install + + install -Dvm644 ../${_gitname}.desktop \ + "$pkgdir/etc/skel/.config/autostart/${_gitname}.desktop" +} + +# vim:set sw=2 sts=2 et: diff --git a/Installer/melawy-welcome/README.md b/Installer/melawy-welcome/README.md new file mode 100644 index 0000000..57f9664 --- /dev/null +++ b/Installer/melawy-welcome/README.md @@ -0,0 +1,11 @@ +# melawy-welcome +Welcome screen for Melawy Linux + +### Donate +[Tinkoff](https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066) + +[YooMoney](https://yoomoney.ru/to/4100115921160758) + +[Qiwi](https://qiwi.com/n/VALERIAFADEEVA) + +Etherium 0x981FBf878fe451BDB83BEaF68078394d4B13213f diff --git a/Installer/melawy-welcome/melawy-welcome/FETCH_HEAD b/Installer/melawy-welcome/melawy-welcome/FETCH_HEAD new file mode 100644 index 0000000..34f63f7 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/FETCH_HEAD @@ -0,0 +1,83 @@ +fb83293f266709370cf58a173d2f0c1ebd82c7a8 not-for-merge branch 'develop' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0aef4b8275a657e36614a3b1418601b0b9c08923 not-for-merge branch 'gtk4' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +4deac1c84634cc1928d461123e5717b06bce99a2 not-for-merge branch 'hello.ftl-polish' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +80ea978741ea5da283e9427e490b8a0368c17751 not-for-merge 'refs/pull/1/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +4a57717cd7ab3d8db927e7770fdf6ffdf01c5cb2 not-for-merge 'refs/pull/10/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +5b0ef593bc68a206e90fb00a3f5696fca0ed31b1 not-for-merge 'refs/pull/11/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +209b660d79c0f98ae421d76ecb9e09889919a27c not-for-merge 'refs/pull/12/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +993ff8e33d81c56ad869682d1996f8f55dbebdf2 not-for-merge 'refs/pull/13/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0a1fbe8b4595e63542d5d04356b6cb03f813a520 not-for-merge 'refs/pull/14/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +72f4c5659fb74684a8d8b374e7cb9292a24e1ecd not-for-merge 'refs/pull/15/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +fa87f9834cec8b11098f42b4ff8e5d0fa678566d not-for-merge 'refs/pull/16/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +1e41089528ff9f7e56fcdc16eb55d712c30fce79 not-for-merge 'refs/pull/17/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +83304f10a5c1a8a7f7f3dfd5fe19ceec79c10fc9 not-for-merge 'refs/pull/18/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d33ec1e2b3dcf1ea5d6757c5905df2539a0f797b not-for-merge 'refs/pull/19/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +35c4ab87ea569b4d36cb1532f8f2960d9e5f597c not-for-merge 'refs/pull/2/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +f363f638d4c1880245f5f535adb63eafe96e78e8 not-for-merge 'refs/pull/20/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +7252dc3a13d6ace869afd8f64a9b12a7d388204f not-for-merge 'refs/pull/21/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +03c33456c752ae0573604e798e41f7c7fc13dcc0 not-for-merge 'refs/pull/22/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +c47926eb8b741349d541da8867d72b24022f373f not-for-merge 'refs/pull/23/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +9127a479a17eb1ffcd06e691ff7af4b1d3df9b57 not-for-merge 'refs/pull/24/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +567eac4d95de6b82ad97b91bd99810136f8774d8 not-for-merge 'refs/pull/25/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0bca59a8af4b022d42c6f7d73badc3ca52c98657 not-for-merge 'refs/pull/26/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +67bab48d17d15b0433e5793b4218d83a329959b9 not-for-merge 'refs/pull/27/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d5603bb6cb375d410643cd03e767d9e49231cdc8 not-for-merge 'refs/pull/28/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +b5006e97d091228ac1836f8e3e704194cfd237f4 not-for-merge 'refs/pull/29/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +8002c93ff2114c60ca476f88458d11f262774dbb not-for-merge 'refs/pull/3/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +da1f2ab5d126aecaa593fb0c4ae5ece0a6a7c0f3 not-for-merge 'refs/pull/30/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +eb85a297153a7adc68ab8fd879c38b68065be3d7 not-for-merge 'refs/pull/31/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +8fde5e90cfaa90261b9a1416e5869d36ac7ea20e not-for-merge 'refs/pull/32/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +6670bb247c954e2d663204d0e3700a18e00b13ff not-for-merge 'refs/pull/33/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +804ee3256a72174d56a79afbc170e8622f105bfe not-for-merge 'refs/pull/34/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d76926d6e17b6f79c2e637fb12931081f562225a not-for-merge 'refs/pull/35/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +cc6e626af348e09506f7d5b2afe1154637f42943 not-for-merge 'refs/pull/36/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +14f41a38e4b0a47e349a0bd8895ea341507aab0d not-for-merge 'refs/pull/37/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +f32f38f4ff5e0acc32c91860b9ce22eff105ebd3 not-for-merge 'refs/pull/38/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d0ce7cfecaad513cf393c064adda6c0cf2a677a1 not-for-merge 'refs/pull/39/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +4b08890e77ca6f94fc9c1d7d1899c585515791ad not-for-merge 'refs/pull/4/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +300f2715386699210fddc1bdb50e975c669b3c79 not-for-merge 'refs/pull/40/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +df57421b9b88da9b3e78d107cb917a688902fc38 not-for-merge 'refs/pull/41/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +f7e3e4f99f6850911b3ff517f11c82517dab1d73 not-for-merge 'refs/pull/42/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d51fda859dcdc525129e0d20e8fd176ccdaa251d not-for-merge 'refs/pull/43/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +c09ce9addedb973983d0f31d7707092750d50ca1 not-for-merge 'refs/pull/44/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +481b35bf79a6e914eadf0153668e5b43ee65673f not-for-merge 'refs/pull/45/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +5db6500a71286dbd622ae443278c6c206f5b2f25 not-for-merge 'refs/pull/46/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +8d7a73c7af2561a47049231abda9d750b82ddf1a not-for-merge 'refs/pull/47/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +f522f3d170a1e4b395da0cfec610d84b1728b592 not-for-merge 'refs/pull/48/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +12edc11fa65bfd6adb95d4dd8a8b3219d4ef9b45 not-for-merge 'refs/pull/49/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +e6bf794d841fc060b606db9605772f2dfd71b578 not-for-merge 'refs/pull/5/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +db4f65b17b850b0ddf87cd0f4582e1df6e025090 not-for-merge 'refs/pull/50/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +7886403c4830a048d278c358350517da85ace234 not-for-merge 'refs/pull/51/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +92fc56c4c86bfd6f5768146f12e5a5ca6be24b5a not-for-merge 'refs/pull/52/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0c5f63eb3afa5e49d425b2c0730c5851bba292dc not-for-merge 'refs/pull/53/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +1e7532d523c6967c81438e2c03f5730c394dd69c not-for-merge 'refs/pull/54/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +efcb83413b8152b66b5252a59589185d06e3abe6 not-for-merge 'refs/pull/55/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +cc22d1eaff631d655aa4571bef42071a3613a96b not-for-merge 'refs/pull/56/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +a6eeb770d4ad15d4126fc9330c0a181d02aed540 not-for-merge 'refs/pull/57/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +4deac1c84634cc1928d461123e5717b06bce99a2 not-for-merge 'refs/pull/58/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +d3119b132c8ad3e4437ec0bc84555c5f3d34567f not-for-merge 'refs/pull/59/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +8e2037019e0cbc662f11ecfb4997e6d14736a06c not-for-merge 'refs/pull/6/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +a2fc19ff6b7cb139c0ea255eb4aa5a8493c6f586 not-for-merge 'refs/pull/60/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +3b216b85ab49913fa4caca1c5e2ffa838900b9c2 not-for-merge 'refs/pull/60/merge' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +6cf3f61020763ec867bf0a2f0c181b93117a9576 not-for-merge 'refs/pull/7/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +dd7087ac6602807bb671dde44c9bd99cc905e180 not-for-merge 'refs/pull/8/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +b452ee56a6d1109c1d772c17e8ea071b1cdc16b1 not-for-merge 'refs/pull/9/head' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +878e7953d91d87e6c7a00eff808f030273b1d9f4 not-for-merge tag 'v0.10.0' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +7601d14d080a7126464a5df4b201d81f7d2f64ad not-for-merge tag 'v0.10.1' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +75b89db706884f0929bda2e978eceae4219b2422 not-for-merge tag 'v0.8.0' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +e41ed25c7e5323d576d8347411b8fc137bc38abb not-for-merge tag 'v0.8.5' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +e1659f93e368f5ea0a496e034e407dc4a1bad7a5 not-for-merge tag 'v0.8.6' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +de0a7425c70a817954b9b19025323eac53feb319 not-for-merge tag 'v0.8.7' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +7d2a5dedcd340f0633c411af75ebd094c77d4803 not-for-merge tag 'v0.8.8' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +50fefee7cfc5c9dc508a3edbf06040263a4ecaaa not-for-merge tag 'v0.8.9' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +76e4a2d96a84abd6a81eeaec09f22035e1089f5f not-for-merge tag 'v0.9.0' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0ad270c85c68acc887db0b6a591db9a7bb04ab8e not-for-merge tag 'v0.9.1' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +22d83c8721f784dfbc600f4dc12ab24f7cf2e3fb not-for-merge tag 'v0.9.10' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +c590a2a916fccc0ca0ab326c2a8d8d4341c47569 not-for-merge tag 'v0.9.2' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +25febeb3bffcd1c665d9f674ebaf8c1d1190c40a not-for-merge tag 'v0.9.3' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +9112af76450da0fb4568d50fb986f7261e1971d7 not-for-merge tag 'v0.9.4' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +6226aa48793f34c69be0f124f5d7381a38346aff not-for-merge tag 'v0.9.5' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +14ad98637bdddf23257d7356d21c474caedb2c91 not-for-merge tag 'v0.9.6' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +0a7f4908b6c487fc3cc669fca2029555b8035b63 not-for-merge tag 'v0.9.7' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +bd7dceb7ae607510a91404915111a4c8cce6b944 not-for-merge tag 'v0.9.8' of https://git.melawy.ru/Melawy-Linux/melawy-welcome +7820fecfa3ac58cf2a8a82df14544ca7f57cde76 not-for-merge tag 'v0.9.9' of https://git.melawy.ru/Melawy-Linux/melawy-welcome diff --git a/Installer/melawy-welcome/melawy-welcome/HEAD b/Installer/melawy-welcome/melawy-welcome/HEAD new file mode 100644 index 0000000..7ee7e4f --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/HEAD @@ -0,0 +1 @@ +ref: refs/heads/develop diff --git a/Installer/melawy-welcome/melawy-welcome/config b/Installer/melawy-welcome/melawy-welcome/config new file mode 100644 index 0000000..bea195d --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/config @@ -0,0 +1,8 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = true +[remote "origin"] + url = https://git.melawy.ru/Melawy-Linux/melawy-welcome.git + fetch = +refs/*:refs/* + mirror = true diff --git a/Installer/melawy-welcome/melawy-welcome/description b/Installer/melawy-welcome/melawy-welcome/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/applypatch-msg.sample b/Installer/melawy-welcome/melawy-welcome/hooks/applypatch-msg.sample new file mode 100755 index 0000000..a5d7b84 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/commit-msg.sample b/Installer/melawy-welcome/melawy-welcome/hooks/commit-msg.sample new file mode 100755 index 0000000..b58d118 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/fsmonitor-watchman.sample b/Installer/melawy-welcome/melawy-welcome/hooks/fsmonitor-watchman.sample new file mode 100755 index 0000000..23e856f --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/post-update.sample b/Installer/melawy-welcome/melawy-welcome/hooks/post-update.sample new file mode 100755 index 0000000..ec17ec1 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-applypatch.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-applypatch.sample new file mode 100755 index 0000000..4142082 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-commit.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-commit.sample new file mode 100755 index 0000000..e144712 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-merge-commit.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-merge-commit.sample new file mode 100755 index 0000000..399eab1 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-push.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-push.sample new file mode 100755 index 0000000..4ce688d --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-rebase.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-rebase.sample new file mode 100755 index 0000000..6cbef5c --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/pre-receive.sample b/Installer/melawy-welcome/melawy-welcome/hooks/pre-receive.sample new file mode 100755 index 0000000..a1fd29e --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/prepare-commit-msg.sample b/Installer/melawy-welcome/melawy-welcome/hooks/prepare-commit-msg.sample new file mode 100755 index 0000000..10fa14c --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/push-to-checkout.sample b/Installer/melawy-welcome/melawy-welcome/hooks/push-to-checkout.sample new file mode 100755 index 0000000..af5a0c0 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/Installer/melawy-welcome/melawy-welcome/hooks/update.sample b/Installer/melawy-welcome/melawy-welcome/hooks/update.sample new file mode 100755 index 0000000..c4d426b --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/hooks/update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/Installer/melawy-welcome/melawy-welcome/info/exclude b/Installer/melawy-welcome/melawy-welcome/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/05/0ec226f9d982f51f94ec871aa0c6403219740d b/Installer/melawy-welcome/melawy-welcome/objects/05/0ec226f9d982f51f94ec871aa0c6403219740d new file mode 100644 index 0000000..74326bc --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/objects/05/0ec226f9d982f51f94ec871aa0c6403219740d @@ -0,0 +1,2 @@ +xM +0@a9EB_3 d&Zhl #Z.So2Zp 8% f$%Vl1>0fJK y<%]b'&w$ e;`( o<^A[yVRb%X ;OO \ No newline at end of file diff --git a/Installer/melawy-welcome/melawy-welcome/objects/30/9d47787df8c23df76408a4cddc5cf2ae8a44a7 b/Installer/melawy-welcome/melawy-welcome/objects/30/9d47787df8c23df76408a4cddc5cf2ae8a44a7 new file mode 100644 index 0000000..c2618db Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/30/9d47787df8c23df76408a4cddc5cf2ae8a44a7 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/5c/425872746eb6d6c5dcb84a695e0c1b592edae6 b/Installer/melawy-welcome/melawy-welcome/objects/5c/425872746eb6d6c5dcb84a695e0c1b592edae6 new file mode 100644 index 0000000..946dd95 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/5c/425872746eb6d6c5dcb84a695e0c1b592edae6 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/64/d1be41e6e3f96cd87738627aa722a0b3f76a6b b/Installer/melawy-welcome/melawy-welcome/objects/64/d1be41e6e3f96cd87738627aa722a0b3f76a6b new file mode 100644 index 0000000..69235cf Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/64/d1be41e6e3f96cd87738627aa722a0b3f76a6b differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/66/bfdf37c7a60f8a3b8c888cf39449a001687969 b/Installer/melawy-welcome/melawy-welcome/objects/66/bfdf37c7a60f8a3b8c888cf39449a001687969 new file mode 100644 index 0000000..7976e4f Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/66/bfdf37c7a60f8a3b8c888cf39449a001687969 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/82/cfd2f49fd4ce0b88b0594805edb3505fcb718f b/Installer/melawy-welcome/melawy-welcome/objects/82/cfd2f49fd4ce0b88b0594805edb3505fcb718f new file mode 100644 index 0000000..c4eb1c7 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/82/cfd2f49fd4ce0b88b0594805edb3505fcb718f differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/83/e5a479970f0b2191ede397551cf21398874396 b/Installer/melawy-welcome/melawy-welcome/objects/83/e5a479970f0b2191ede397551cf21398874396 new file mode 100644 index 0000000..5892535 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/83/e5a479970f0b2191ede397551cf21398874396 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/8a/704874509b9235cf98737a15b43b845b5b7343 b/Installer/melawy-welcome/melawy-welcome/objects/8a/704874509b9235cf98737a15b43b845b5b7343 new file mode 100644 index 0000000..5b51048 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/objects/8a/704874509b9235cf98737a15b43b845b5b7343 @@ -0,0 +1,3 @@ +xM +0a9EBLAĕ74h%ĞBYߗZ.So̒ƀJH5"RlMt&z+5t 8!s X*p +^Ar4 dA^|m"y̼l 倡UiԫT.z58#]/ǚN \ No newline at end of file diff --git a/Installer/melawy-welcome/melawy-welcome/objects/93/746ab43d6e7274ddf8e3ddb192dd09eb01ead0 b/Installer/melawy-welcome/melawy-welcome/objects/93/746ab43d6e7274ddf8e3ddb192dd09eb01ead0 new file mode 100644 index 0000000..f95cc5b Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/93/746ab43d6e7274ddf8e3ddb192dd09eb01ead0 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/ab/82135c68ba2c0418732229ff1abe54964da27e b/Installer/melawy-welcome/melawy-welcome/objects/ab/82135c68ba2c0418732229ff1abe54964da27e new file mode 100644 index 0000000..ee08679 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/ab/82135c68ba2c0418732229ff1abe54964da27e differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/b1/2deb4bdd5cbb3e8688dbabdbaa061afa7642c2 b/Installer/melawy-welcome/melawy-welcome/objects/b1/2deb4bdd5cbb3e8688dbabdbaa061afa7642c2 new file mode 100644 index 0000000..b788076 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/b1/2deb4bdd5cbb3e8688dbabdbaa061afa7642c2 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/fb/83293f266709370cf58a173d2f0c1ebd82c7a8 b/Installer/melawy-welcome/melawy-welcome/objects/fb/83293f266709370cf58a173d2f0c1ebd82c7a8 new file mode 100644 index 0000000..5a6ed0c Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/fb/83293f266709370cf58a173d2f0c1ebd82c7a8 differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.idx b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.idx new file mode 100644 index 0000000..c6c94a1 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.idx differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.pack b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.pack new file mode 100644 index 0000000..78a130d Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.pack differ diff --git a/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.rev b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.rev new file mode 100644 index 0000000..8235ab8 Binary files /dev/null and b/Installer/melawy-welcome/melawy-welcome/objects/pack/pack-580461a408c145e325dfc6ab8fda7d9e5311d87d.rev differ diff --git a/Installer/melawy-welcome/melawy-welcome/packed-refs b/Installer/melawy-welcome/melawy-welcome/packed-refs new file mode 100644 index 0000000..8ba6ea4 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/packed-refs @@ -0,0 +1,84 @@ +# pack-refs with: peeled fully-peeled sorted +78226c985cdba6ff87ea94d6546e9c76e43d1f9b refs/heads/develop +0aef4b8275a657e36614a3b1418601b0b9c08923 refs/heads/gtk4 +4deac1c84634cc1928d461123e5717b06bce99a2 refs/heads/hello.ftl-polish +80ea978741ea5da283e9427e490b8a0368c17751 refs/pull/1/head +4a57717cd7ab3d8db927e7770fdf6ffdf01c5cb2 refs/pull/10/head +5b0ef593bc68a206e90fb00a3f5696fca0ed31b1 refs/pull/11/head +209b660d79c0f98ae421d76ecb9e09889919a27c refs/pull/12/head +993ff8e33d81c56ad869682d1996f8f55dbebdf2 refs/pull/13/head +0a1fbe8b4595e63542d5d04356b6cb03f813a520 refs/pull/14/head +72f4c5659fb74684a8d8b374e7cb9292a24e1ecd refs/pull/15/head +fa87f9834cec8b11098f42b4ff8e5d0fa678566d refs/pull/16/head +1e41089528ff9f7e56fcdc16eb55d712c30fce79 refs/pull/17/head +83304f10a5c1a8a7f7f3dfd5fe19ceec79c10fc9 refs/pull/18/head +d33ec1e2b3dcf1ea5d6757c5905df2539a0f797b refs/pull/19/head +35c4ab87ea569b4d36cb1532f8f2960d9e5f597c refs/pull/2/head +f363f638d4c1880245f5f535adb63eafe96e78e8 refs/pull/20/head +7252dc3a13d6ace869afd8f64a9b12a7d388204f refs/pull/21/head +03c33456c752ae0573604e798e41f7c7fc13dcc0 refs/pull/22/head +c47926eb8b741349d541da8867d72b24022f373f refs/pull/23/head +9127a479a17eb1ffcd06e691ff7af4b1d3df9b57 refs/pull/24/head +567eac4d95de6b82ad97b91bd99810136f8774d8 refs/pull/25/head +0bca59a8af4b022d42c6f7d73badc3ca52c98657 refs/pull/26/head +67bab48d17d15b0433e5793b4218d83a329959b9 refs/pull/27/head +d5603bb6cb375d410643cd03e767d9e49231cdc8 refs/pull/28/head +b5006e97d091228ac1836f8e3e704194cfd237f4 refs/pull/29/head +8002c93ff2114c60ca476f88458d11f262774dbb refs/pull/3/head +da1f2ab5d126aecaa593fb0c4ae5ece0a6a7c0f3 refs/pull/30/head +eb85a297153a7adc68ab8fd879c38b68065be3d7 refs/pull/31/head +8fde5e90cfaa90261b9a1416e5869d36ac7ea20e refs/pull/32/head +6670bb247c954e2d663204d0e3700a18e00b13ff refs/pull/33/head +804ee3256a72174d56a79afbc170e8622f105bfe refs/pull/34/head +d76926d6e17b6f79c2e637fb12931081f562225a refs/pull/35/head +cc6e626af348e09506f7d5b2afe1154637f42943 refs/pull/36/head +14f41a38e4b0a47e349a0bd8895ea341507aab0d refs/pull/37/head +f32f38f4ff5e0acc32c91860b9ce22eff105ebd3 refs/pull/38/head +d0ce7cfecaad513cf393c064adda6c0cf2a677a1 refs/pull/39/head +4b08890e77ca6f94fc9c1d7d1899c585515791ad refs/pull/4/head +300f2715386699210fddc1bdb50e975c669b3c79 refs/pull/40/head +df57421b9b88da9b3e78d107cb917a688902fc38 refs/pull/41/head +f7e3e4f99f6850911b3ff517f11c82517dab1d73 refs/pull/42/head +d51fda859dcdc525129e0d20e8fd176ccdaa251d refs/pull/43/head +c09ce9addedb973983d0f31d7707092750d50ca1 refs/pull/44/head +481b35bf79a6e914eadf0153668e5b43ee65673f refs/pull/45/head +5db6500a71286dbd622ae443278c6c206f5b2f25 refs/pull/46/head +8d7a73c7af2561a47049231abda9d750b82ddf1a refs/pull/47/head +f522f3d170a1e4b395da0cfec610d84b1728b592 refs/pull/48/head +12edc11fa65bfd6adb95d4dd8a8b3219d4ef9b45 refs/pull/49/head +e6bf794d841fc060b606db9605772f2dfd71b578 refs/pull/5/head +db4f65b17b850b0ddf87cd0f4582e1df6e025090 refs/pull/50/head +7886403c4830a048d278c358350517da85ace234 refs/pull/51/head +92fc56c4c86bfd6f5768146f12e5a5ca6be24b5a refs/pull/52/head +0c5f63eb3afa5e49d425b2c0730c5851bba292dc refs/pull/53/head +1e7532d523c6967c81438e2c03f5730c394dd69c refs/pull/54/head +efcb83413b8152b66b5252a59589185d06e3abe6 refs/pull/55/head +cc22d1eaff631d655aa4571bef42071a3613a96b refs/pull/56/head +a6eeb770d4ad15d4126fc9330c0a181d02aed540 refs/pull/57/head +4deac1c84634cc1928d461123e5717b06bce99a2 refs/pull/58/head +d3119b132c8ad3e4437ec0bc84555c5f3d34567f refs/pull/59/head +8e2037019e0cbc662f11ecfb4997e6d14736a06c refs/pull/6/head +a2fc19ff6b7cb139c0ea255eb4aa5a8493c6f586 refs/pull/60/head +3b216b85ab49913fa4caca1c5e2ffa838900b9c2 refs/pull/60/merge +6cf3f61020763ec867bf0a2f0c181b93117a9576 refs/pull/7/head +dd7087ac6602807bb671dde44c9bd99cc905e180 refs/pull/8/head +b452ee56a6d1109c1d772c17e8ea071b1cdc16b1 refs/pull/9/head +878e7953d91d87e6c7a00eff808f030273b1d9f4 refs/tags/v0.10.0 +7601d14d080a7126464a5df4b201d81f7d2f64ad refs/tags/v0.10.1 +75b89db706884f0929bda2e978eceae4219b2422 refs/tags/v0.8.0 +e41ed25c7e5323d576d8347411b8fc137bc38abb refs/tags/v0.8.5 +e1659f93e368f5ea0a496e034e407dc4a1bad7a5 refs/tags/v0.8.6 +de0a7425c70a817954b9b19025323eac53feb319 refs/tags/v0.8.7 +7d2a5dedcd340f0633c411af75ebd094c77d4803 refs/tags/v0.8.8 +50fefee7cfc5c9dc508a3edbf06040263a4ecaaa refs/tags/v0.8.9 +76e4a2d96a84abd6a81eeaec09f22035e1089f5f refs/tags/v0.9.0 +0ad270c85c68acc887db0b6a591db9a7bb04ab8e refs/tags/v0.9.1 +22d83c8721f784dfbc600f4dc12ab24f7cf2e3fb refs/tags/v0.9.10 +c590a2a916fccc0ca0ab326c2a8d8d4341c47569 refs/tags/v0.9.2 +25febeb3bffcd1c665d9f674ebaf8c1d1190c40a refs/tags/v0.9.3 +9112af76450da0fb4568d50fb986f7261e1971d7 refs/tags/v0.9.4 +6226aa48793f34c69be0f124f5d7381a38346aff refs/tags/v0.9.5 +14ad98637bdddf23257d7356d21c474caedb2c91 refs/tags/v0.9.6 +0a7f4908b6c487fc3cc669fca2029555b8035b63 refs/tags/v0.9.7 +bd7dceb7ae607510a91404915111a4c8cce6b944 refs/tags/v0.9.8 +7820fecfa3ac58cf2a8a82df14544ca7f57cde76 refs/tags/v0.9.9 diff --git a/Installer/melawy-welcome/melawy-welcome/refs/heads/develop b/Installer/melawy-welcome/melawy-welcome/refs/heads/develop new file mode 100644 index 0000000..d220938 --- /dev/null +++ b/Installer/melawy-welcome/melawy-welcome/refs/heads/develop @@ -0,0 +1 @@ +fb83293f266709370cf58a173d2f0c1ebd82c7a8 diff --git a/Updater/arch-linux-updater/PKGBUILD b/Updater/arch-linux-updater/PKGBUILD index 5fbb2b9..d44a7b3 100644 --- a/Updater/arch-linux-updater/PKGBUILD +++ b/Updater/arch-linux-updater/PKGBUILD @@ -2,7 +2,7 @@ _gitname="$(basename $(pwd))" pkgname=("melawy-$_gitname") -pkgver=1.10 +pkgver=1.13 pkgrel=1 pkgdesc="$(head -n 2 README.md | tail -n 1)" arch=('any') @@ -40,6 +40,9 @@ package() { install -dm755 "${pkgdir}/usr/bin/" install -m755 "${srcdir}/$_gitname/target/release/arch-linux-updater" "${pkgdir}/usr/bin/" + install -dm755 "${pkgdir}/usr/share/arch-linux-updater/" + cp -rf "${srcdir}/$_gitname/assets" "${pkgdir}/usr/share/arch-linux-updater/" + install -dm750 "${pkgdir}/etc/sudoers.d/" install -m644 "${srcdir}/$_gitname/melawy-arch-linux-updater" "${pkgdir}/etc/sudoers.d/" }