From e5257b81f5651586a6cc5c3e31995b5ab325f9ae Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Fri, 16 Oct 2020 00:00:54 +0000 Subject: [PATCH] sign repo on removal --- main.sh | 109 +++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 78 insertions(+), 31 deletions(-) diff --git a/main.sh b/main.sh index 6b11a67..37d4ad7 100755 --- a/main.sh +++ b/main.sh @@ -9,34 +9,34 @@ # 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 @@ -48,7 +48,7 @@ fi #remove old versions before build - rm *$1*.pkg.tar.* + rm -f *$1*.tar.* #make and force rebuild if is git package # Mictosoft fonts have problems with checksums and need a seperate argument @@ -58,7 +58,7 @@ "$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) + 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 @@ -66,10 +66,25 @@ 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.??* - cp *$1*.pkg.tar.?? $REPODIR/ - [[ "$SIGN" == "Y" ]] && cp *$1*.pkg.tar.??.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 @@ -90,7 +105,9 @@ 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.?? + 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 @@ -105,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 @@ -114,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 } @@ -128,6 +155,8 @@ 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 @@ -144,13 +173,32 @@ } #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 + + #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 @@ -160,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 $([[ "$SIGN" == "Y" ]] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.$([ -n "$COMPRESSION" ] || echo $COMPRESSION && echo zst) $i + rm -f $REPODIR/*$i* done } @@ -247,4 +295,3 @@ else echo "All packages built successfully" fi - -- Gitblit v1.9.3