From ac333faecc1cced5c465f57aa1070f981ac19f3e Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Sun, 20 Sep 2020 08:16:59 +0000 Subject: [PATCH] Modified email message --- main.sh | 75 +++++++++++++++++++++++++------------ 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/main.sh b/main.sh old mode 100644 new mode 100755 index 53a4e0b..62d0f10 --- a/main.sh +++ b/main.sh @@ -1,20 +1,14 @@ #!/bin/bash +#A basic bash script to automate the building of arch packages +# Usage: main.sh init|add|build_all [-f force] -REPODIR=/repo/x86_64 -BUILDDIR=/repo/build -REPONAME= -UPDATE=N -CLEAN=N -SIGN=N -KEY="" -NUM_OLD=5 -export PACKAGER="John Doe <jd@change.me>" -EMAIL="" +source vars.sh ERRORS="" #Helper for finding newest and oldest files #Sourced from stack overflow +# Usage: newold_matching_file [n/o] [filename] function newold_matching_file { # Use ${1-} instead of $1 in case 'nounset' is set @@ -48,42 +42,55 @@ } #Build latest version of a package +# Usage: build_pkg [package name] [new?] [-f force] function build_pkg { #check if PKGBUILD has updated, don't rebuild if hasn't changed - #rebuild if git is in filename (git tree may change without PKGBUILD) - #rebuild if forced if [[ ! -z $(git pull | grep "Already up to date.") && -z $(echo $1 | grep git) && -z $2 ]]; then return 2 fi + + #remove old versions before build + rm *$1*.pkg.tar.xz* + + #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 #Register error - ERRORS=$(printf '%s %s' "$ERRORS" "$1") + ERRORS="$ERRORS $1" return 1 fi #copy package to repo directory - latest="$(newold_matching_file n '*.pkg.tar.xz')" - cp $latest $REPODIR/$latest - repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$latest + #latest="$(newold_matching_file n '*.pkg.tar.xz')" + #or f in $(find g.tar.xz' + #o + rm $REPODIR/*$1*.pkg.tar.xz* + cp *$1*.pkg.tar.xz $REPODIR/ + [ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.sig $REPODIR + repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/*$1*.pkg.tar.xz + #one #Remove old versions of packages - while [ $NUM_OLD \< $(find . -name '*.pkg.tar.xz' | wc -l) ] - do - old=$(newold_matching_file o '*.pkg.tar.xz') - rm $REPODIR/$old $old - done + #TODO: Want to be able to keep multiple versions of old packages, future work + #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 + # done return 0 } #Update packages in BUILDDIR +# Usage: build_all [-f force] function build_all { #system update if [ $UPDATE == "Y" ]; then sudo pacman -Syu --noconfirm fi + #update every package currently stored - for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -not -path '*/\.*' -type d) + for d in $(find $BUILDDIR -maxdepth 1 -mindepth 1 -type d) do cd $d build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 @@ -93,15 +100,27 @@ } #Add a new package to be built +#There is no name checking so be sure to put in the name correctly +# Usage: add [package name] function add { cd $BUILDDIR git clone https://aur.archlinux.org/$1.git cd $1 - build_pkg $1 new + build_pkg $1 new -f return 0 } +#Remove a package from the build list and repository +# Usage remove [package name] +function remove { + rm -rf $BUILDDIR/$1* + repo-remove $REPODIR/$REPONAME.db.tar.xz $1 + rm $REPODIR/$1* +} + #Check config and create build folders +#Set variables before usage +# Usage: init function init { #check for configuration here [ -z $REPODIR ] && echo "Enter REPODIR" && return 1 @@ -152,12 +171,18 @@ if [ "$ERRORS" != "" ]; then echo "Errors in packages $ERRORS" if [ "$EMAIL" != "" ]; then - printf "Build for $(date)\nErrors found in $ERRORS\nPlease address these soon" | sendmail $EMAIL + echo "To: $EMAIL + Subject: Build errors + + There were build errors for the build at $(date), please address them soon + The errors were: $ERRORS" | sendmail -t fi else echo "All packages built successfully" fi ;; + "remove") + remove $2;; *) - printf "Invalid usage\nUsage: $0 init|add|build_all\n";; + printf "Invalid usage\nUsage: $0 init|add|build-all\n";; esac -- Gitblit v1.9.3