From cb04c8c54b54605681f6ee861d835bb480407288 Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Mon, 16 Nov 2020 06:49:44 +0000
Subject: [PATCH] redirect font make to stdout like the rest
---
main.sh | 27 +++++++++++++--------------
1 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/main.sh b/main.sh
index 5a491fa..58d3292 100755
--- a/main.sh
+++ b/main.sh
@@ -47,7 +47,7 @@
# Usage: build_pkg [package name] [-f force]
function build_pkg {
#check if PKGBUILD has updated, don't rebuild if hasn't changed
- if [[ ! -z $(git pull | grep "Already up to date.") && -z $(grep 'pkgver() {' PKGBUILD) && -z $2 ]]; then
+ if [[ -n $(git pull | grep 'Already up to date.') && -z $(grep 'pkgver() {' PKGBUILD) && -z "$2" ]]; then
return 2
fi
@@ -60,7 +60,7 @@
"$1" == "ttf-office-2007-fonts" ||
"$1" == "ttf-ms-win8" ||
"$1" == "ttf-win7-fonts" ]]; then
- makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums
+ makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) --skipchecksums 2>&1
else
makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1
fi
@@ -81,6 +81,16 @@
done
while read -r -d '' x; do pkgs+=("$x"); done < <(printf "%s\0" "${ipkgs[@]}" | sort -uz)
+ # Weird exceptions
+ if [[ "$1" == "zoom" ]]; then
+ rm zoom*_orig*
+ for i in ${pkgs[@]}; do
+ if [ -z "${i##*_orig*}" ]; then
+ pkgs=(${pkgs[@]/$i})
+ fi
+ done
+ fi
+
#Move package to repodir and add to repo db
#Dont change the database if rebuilt the same package at same release and version
flag=0
@@ -97,16 +107,6 @@
done
else
return;
- fi
-
- # Weird exceptions
- if [[ "$1" == "zoom" ]]; then
- rm zoom*_orig*.pkg.tar.xz
- for i in ${pkgs[@]}; do
- if [ -z "${i##*orig*}" ]; then
- pkgs=${pkgs[@]/$i}
- fi
- done
fi
# Add package to waiting list to be added to repo db
@@ -131,7 +131,7 @@
sleep 1
else
# Remove self from top of queue
- echo 1 > $WAITLST_LCK
+ echo 1 > $WAITLIST_LCK
TEMP=$(mktemp)
tail -n +2 $WAITLIST > $TEMP
cp $TEMP $WAITLIST
@@ -252,7 +252,6 @@
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq core | sort) | tr '\n' ' ')"
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq extra | sort) | tr '\n' ' ')"
rmlist="$rmlist $(comm -12 <(pacman -Slq $REPONAME | sort) <(pacman -Slq community | sort) | tr '\n' ' ')"
- removed=()
TMPFILE=$(mktemp)
for i in $(find $BUILDDIR -mindepth 1 -maxdepth 1 -type d); do
check_pkg $TMPFILE "$(echo $i | rev | cut -d'/' -f1 | rev)" &
--
Gitblit v1.9.3