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 | 74 +++++++++++++++++++++++-------------- 1 files changed, 46 insertions(+), 28 deletions(-) diff --git a/main.sh b/main.sh index 66cc216..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* + rm -f *$1*.tar.* #make and force rebuild if is git package # Mictosoft fonts have problems with checksums and need a seperate argument @@ -80,7 +80,7 @@ if [[ -f $REPODIR/$i ]]; then pkgs=${pkgs[@]/$i} else - rm $REPODIR/*$1* + rm -f $REPODIR/*$1*.tar.* cp $i $REPODIR/ [[ "$SIGN" == "Y" ]] && cp $i.sig $REPODIR/ fi @@ -106,7 +106,7 @@ # Wait until package is at the top of the queue and add to db 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 + 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 @@ -141,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 } @@ -173,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 @@ -189,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 } @@ -276,4 +295,3 @@ else echo "All packages built successfully" fi - -- Gitblit v1.9.3