From 67ef7397884ed4e286cdead875960a68fc0b74d2 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Mon, 21 Sep 2020 12:19:37 +0000 Subject: [PATCH] Add and remove take multiple arguments --- main.sh | 137 +++++++++++++++++++++++++++++++++------------ 1 files changed, 101 insertions(+), 36 deletions(-) diff --git a/main.sh b/main.sh old mode 100644 new mode 100755 index 53a4e0b..a170eaf --- a/main.sh +++ b/main.sh @@ -1,20 +1,12 @@ #!/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="" - -ERRORS="" +source $(dirname "$(realpath $0)")/vars.sh #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,61 +40,120 @@ } #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") + echo $1 >> $REPODIR/.errors 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 + rm $REPODIR/*$1*.pkg.tar.xz* + cp *$1*.pkg.tar.xz $REPODIR/ + [ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.sig $REPODIR + while [ 1 ]; do + if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then + sleep 1 + else + echo 1 > $REPODIR/.waitlist.lck + echo $1 >> $REPODIR/.waitlist + echo 0 > $REPODIR/.waitlist.lck + break + fi + done + while [ 1 ]; do + 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 + sleep 1 + else + echo 1 > $REPODIR/.waitlist.lck + tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp + cat $REPODIR/.waitlist.tmp > $REPODIR/.waitlist + rm $REPODIR/.waitlist.tmp + echo 0 > $REPODIR/.waitlist.lck + break + fi + done + break + else + sleep 10 + fi + done #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 + build_pkg $(echo $d | rev | cut -d'/' -f1 | rev) $1 > /dev/null & done + wait return 0 } #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 + for i in $@; do + cd $BUILDDIR + git clone https://aur.archlinux.org/$i.git + cd $i + build_pkg $i new -f + done return 0 } +#Remove a package from the build list and repository +# 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* + done +} + #Check config and create build folders +#Set variables before usage +# Usage: init function init { + 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 @@ -113,7 +164,7 @@ [ ! -d $BUILDDIR ] && mkdir -p $BUILDDIR #packages required to build others - sudo pacman -S --noconfirm base-devel git + pacman -S --noconfirm base-devel git #add repo to pacman.conf so can install own packages if [ -z $(grep "$REPONAME" /etc/pacman.conf) ]; then @@ -121,7 +172,7 @@ fi #create GPG key for package signing - if [ "$SIGN" == "Y" && "$KEY" == "" ]; then + if [[ "$SIGN" == "Y" && "$KEY" == "" ]]; then ( echo "Key-Type: RSA" echo "Key-Length: 2048" @@ -142,6 +193,16 @@ return 0 } +function send_email { + ( + echo "From: build@localhost" + 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" + ) | sendmail -t +} + case $1 in "init") init;; @@ -149,15 +210,19 @@ add $2;; "build-all") build_all $([ "$2" == "-f" ] && echo "-f") - if [ "$ERRORS" != "" ]; then - echo "Errors in packages $ERRORS" + if [ -f $REPODIR/.errors ]; then + ERRORS=$(cat $REPODIR/.errors | tr '\n' ' ') + rm $REPODIR/.errors + echo "Errors in packages: $ERRORS" if [ "$EMAIL" != "" ]; then - printf "Build for $(date)\nErrors found in $ERRORS\nPlease address these soon" | sendmail $EMAIL + send_email $ERRORS 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