From e4b0c55cd80498cdbd67b9dd14a61e0680c7ffda Mon Sep 17 00:00:00 2001 From: DarkFeather Date: Sun, 7 Apr 2024 23:39:27 -0500 Subject: [PATCH] Making links to repos browser-viewable, not just git-clone targets --- maat | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/maat b/maat index 3df645c..a6f7e97 100755 --- a/maat +++ b/maat @@ -61,6 +61,7 @@ function BuildPackage() { for pkg in `find . -type f | grep -E "${pkgExt}""\$"`; do printf "$pkg
" >> "$webfile" pkgname="$(basename "$pkg" | cut -f 1 -d '.' | sed 's/-[[:digit:]]\+$//')" + # Remove old copies find "${pkgdir}/${suffix}/" -name "${pkgname}-[0-9]*" -exec rm {} \; mv "$pkg" "$pkgdir"/"$suffix"; mv "$pkg"".sig" "$pkgdir"/"$suffix"; @@ -95,11 +96,11 @@ function BuildRepo() { for pkgbuild in `find . -type f -name PKGBUILD`; do cd "$(dirname "$pkgbuild")" # Tell the status file about it. - printf ''"$repodir -- $pkgbuild"'' >> "$webfile" + printf ''"$repodir -- $pkgbuild"'' >> "$webfile" if [ -f Makefile ] && [ `grep -E -c '^test:' Makefile` -ge 1 ]; then # Have to try to install dependencies first for dep in $(grep makedepends PKGBUILD | cut -f 2 -d '(' | cut -f 1 -d ')' | sed "s/'//g"); do - pacman -Sy "$dep" --noconfirm --needed + pacman -S "$dep" --noconfirm --needed done # Check test status. timeout --preserve-status "$timeout" sudo -u "$deprivuser" /bin/bash -l -c "cd $PWD; make test" &>> "$pkgdir"/"$repodir".txt @@ -129,7 +130,6 @@ function UpdateLocalRepo() { set -x cd "$pkgdir" chown -R "$deprivuser": . - # TODO Add deduplication of updated files -- keep latest 3 versions. rm -Rf AniNIX.[db,files]* sudo -u "$deprivuser" repo-add --sign ./AniNIX.db.tar.zst `ls -1 *"${pkgExt}"` cd aur/