From 7c40875bd5a8438e91d4ce60be114dd546c3386b Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Thu, 15 Oct 2020 23:56:42 +0000 Subject: [PATCH] added database compression type to remove --- main.sh | 193 ++++++++++++++++++++++++++++++++--------------- 1 files changed, 130 insertions(+), 63 deletions(-) diff --git a/main.sh b/main.sh index 071965c..6438552 100755 --- a/main.sh +++ b/main.sh @@ -9,38 +9,38 @@ # Usage: newold_matching_file [n/o] [filename] function newold_matching_file { - # Use ${1-} instead of $1 in case 'nounset' is set - local -r glob_pattern=${2-} + # Use ${1-} instead of $1 in case 'nounset' is set + local -r glob_pattern=${2-} - # To avoid printing garbage if no files match the pattern, set - # 'nullglob' if necessary - local -i need_to_unset_nullglob=0 - if [[ ":$BASHOPTS:" != *:nullglob:* ]] ; then - shopt -s nullglob - need_to_unset_nullglob=1 - fi + # To avoid printing garbage if no files match the pattern, set + # 'nullglob' if necessary + local -i need_to_unset_nullglob=0 + if [[ ":$BASHOPTS:" != *:nullglob:* ]] ; then + shopt -s nullglob + need_to_unset_nullglob=1 + fi - file= - for f in $glob_pattern ; do + file= + for f in $glob_pattern ; do if [ $1 == "n" ]; then [[ -z $f || $f -nt $_file ]] && file=$f elif [ $1 == "o" ]; then [[ -z $f || $f -ot $_file ]] && file=$f fi - done + done - # To avoid unexpected behaviour elsewhere, unset nullglob if it was - # set by this function - (( need_to_unset_nullglob )) && shopt -u nullglob + # To avoid unexpected behaviour elsewhere, unset nullglob if it was + # set by this function + (( need_to_unset_nullglob )) && shopt -u nullglob - # Use printf instead of echo in case the file name begins with '-' - [[ -n $file ]] && printf '%s\n' "$file" + # Use printf instead of echo in case the file name begins with '-' + [[ -n $file ]] && printf '%s\n' "$file" - return 0 + return 0 } #Build latest version of a package -# Usage: build_pkg [package name] [new?] [-f force] +# 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 $(echo $1 | grep git) && -z $2 ]]; then @@ -48,23 +48,52 @@ fi #remove old versions before build - rm *$1*.pkg.tar.xz* + rm -f *$1*.tar.* #make and force rebuild if is git package - makepkg -s --noconfirm $([ $CLEAN == "Y" ] && echo "-c") $([ $SIGN == "Y" ] && echo "--sign --key $KEY") $([ "$2" == "-f" ] && echo -f) - if [ $? != 0 ]; then + # Mictosoft fonts have problems with checksums and need a seperate argument + if [[ "$1" == "ttf-ms-win10" || + "$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 + else + makepkg -s --noconfirm $([[ $CLEAN == "Y" ]] && echo "-c") $([[ $SIGN == "Y" ]] && echo "--sign --key $KEY") $([[ "$2" == "-f" ]] && echo -f) 2>&1 + fi + if [[ $? != 0 ]]; then #Register error echo $1 >> $REPODIR/.errors return 1 fi + #Get build artifact names + source PKGBUILD + pkgs=() + for i in ${pkgname[@]}; do + #pkgs+=("$i-$pkgver-$pkgrel") + pkgs+=("$(find . -mindepth 1 -maxdepth 1 -type f -name "$1*.tar.*" -not -name "*.sig" | sed 's/^\.\///')") + done + #Move package to repodir and add to repo db - rm $REPODIR/*$1*.pkg.tar.xz* - cp *$1*.pkg.tar.xz $REPODIR/ - [ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.sig $REPODIR + #Dont change the database if rebuilt the same package at same release and version + for i in ${pkgs[@]}; do + if [[ -f $REPODIR/$i ]]; then + pkgs=${pkgs[@]/$i} + else + rm -f $REPODIR/*$1*.tar.* + cp $i $REPODIR/ + [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/ + fi + done + + # Weird exceptions + if [[ "$1" == "zoom" ]]; then + rm zoom*_orig*.pkg.tar.xz + fi + # Add package to waiting list to be added to repo db - while [ 1 ]; do - if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + while true; do + if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then sleep 1 else echo 1 > $REPODIR/.waitlist.lck @@ -73,12 +102,14 @@ break fi done - while [ 1 ]; do + while true; do # Wait until package is at the top of the queue and add to db - if [ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]; then - repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/*$1*.pkg.tar.xz - while [ 1 ]; do - if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + if [[ "$(head -n1 $REPODIR/.waitlist)" == "$1" ]]; then + for i in ${pkgs[@]}; do + repo-add $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $REPODIR/$i + done + while true; do + if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then sleep 1 else # Remove self from top of queue @@ -91,6 +122,16 @@ done break else + if [[ -z "$(grep $1 $REPODIR/.waitlist)" ]]; then + # Not on waitlist for some reason, need to readd + if [[ $(cat $REPODIR/.waitlist.lck) == 1 ]]; then + sleep 1 + else + echo 1 > $REPODIR/.waitlist.lck + echo $1 >> $REPODIR/.waitlist + echo 0 > $REPODIR/.waitlist.lck + fi + fi sleep 10 fi done @@ -100,8 +141,8 @@ #Currently old package versions stay in the repodir indefinately # while [ $NUM_OLD \< $(find . -name '*.pkg.tar.xz' | wc -l) ] # do - # old=$(newold_matching_file o '*.pkg.tar.xz') - # rm $REPODIR/$old $old + # old=$(newold_matching_file o '*.pkg.tar.xz') + # rm $REPODIR/$old $old # done return 0 } @@ -110,15 +151,21 @@ # Usage: build_all [-f force] function build_all { #system update - if [ $UPDATE == "Y" ]; then + if [[ $UPDATE == "Y" ]]; then sudo pacman -Syu --noconfirm fi + #Remove waitlist and errors from old builds + rm -f $REPODIR/{.waitlist,.errors} #update every package currently stored for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d) do cd $d - build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 > /dev/null & + if [[ "$PARALLEL" == "Y" ]]; then + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 &> $([[ "$QUIET" == "Y" ]] && echo "/dev/null" || echo "/dev/tty") & + else + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 &> $([[ "$QUIET" == "Y" ]] && echo "/dev/null" || echo "/dev/tty") + fi done wait @@ -126,14 +173,33 @@ } #Add a new package to be built -#There is no name checking so be sure to put in the name correctly +#Adding build dependencies is # Usage: add [package name] function add { for i in $@; do cd $BUILDDIR + if [[ -z $(git ls-remote https://aur.archlinux.org/$i.git) ]]; then + echo "Not a package" + exit 2 + fi git clone https://aur.archlinux.org/$i.git cd $i - build_pkg $i new -f + + #check for all build dependencies + for i in ${makedepends[@]}; do + if pacman -Si $i; then + makedepends=${makedepends[@]/$delete} + fi &>/dev/null + done + for i in ${makedepends[@]}; do + add $i + done + if [[ -n "${makedepends[@]}" ]]; then + sudo pacman -Sy + fi + + #Actually build wanted package + build_pkg $i -f done return 0 } @@ -142,9 +208,9 @@ # Usage remove [package name] function remove { for i in $@; do - rm -rf $BUILDDIR/$i* - repo-remove $REPODIR/$REPONAME.db.tar.xz $i - rm $REPODIR/$i* + rm -rf $BUILDDIR/$i + repo-remove $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $i + rm -f $REPODIR/*$i* done } @@ -152,24 +218,24 @@ #Set variables before usage # Usage: init function init { - if [ $uid != 1 ]; then + if [[ $uid != 1 ]]; then echo "This must be run as root" fi #check for configuration here - [ -z $REPODIR ] && echo "Enter REPODIR" && return 1 - [ -z $BUILDDIR ] && echo "Enter BUILDDIR" && return 2 - [ -z $REPONAME ] && echo "Enter REPONAME" && return 3 + [[ -z $REPODIR ]] && echo "Enter REPODIR" && return 1 + [[ -z $BUILDDIR ]] && echo "Enter BUILDDIR" && return 2 + [[ -z $REPONAME ]] && echo "Enter REPONAME" && return 3 #make build directories - [ ! -d $REPODIR ] && mkdir -p $REPODIR - [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR + [[ ! -d $REPODIR ]] && mkdir -p $REPODIR + [[ ! -d $BUILDDIR ]] && mkdir -p $BUILDDIR #packages required to build others pacman -S --noconfirm base-devel git #add repo to pacman.conf so can install own packages - if [ -z $(grep "$REPONAME" /etc/pacman.conf) ]; then + if [[ -z $(grep "$REPONAME" /etc/pacman.conf) ]]; then printf "[$REPONAME]\nSigLevel = Optional TrustAll\nServer = file://$REPODIR\n" >> /etc/pacman.conf fi @@ -201,7 +267,7 @@ echo "To: $EMAIL" echo "Subject: Build errors" echo "There were build errors for the build of $REPONAME at $(date), please address them soon." - echo "The errors were: $1" + echo "The errors were: $@" ) | sendmail -t } @@ -209,22 +275,23 @@ "init") init;; "add") - add $2;; + add ${@:2};; "build-all") - build_all $([ "$2" == "-f" ] && echo "-f") - if [ -f $REPODIR/.errors ]; then - ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') - rm $REPODIR/.errors - echo "Errors in packages: $ERRORS" - if [ "$EMAIL" != "" ]; then - send_email $ERRORS - fi - else - echo "All packages built successfully" - fi - ;; + build_all $([[ "$2" == "-f" ]] && echo "-f");; "remove") - remove $2;; + remove ${@:2};; *) printf "Invalid usage\nUsage: $0 init|add|build-all\n";; esac + +# Error reporting, send email only for build-all as assuming an batch job for that +if [[ -f $REPODIR/.errors ]]; then + ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') + rm $REPODIR/.errors + echo "Errors in packages: $ERRORS" + if [[ "$EMAIL" != "" && "$1" == "build-all" ]]; then + send_email $ERRORS + fi +else + echo "All packages built successfully" +fi -- Gitblit v1.9.3