From 09a580974522a352bc691fe1c0b947ed69533c19 Mon Sep 17 00:00:00 2001 From: Chizi123 <build@jsrv.com> Date: Sat, 19 Sep 2020 04:29:26 +0000 Subject: [PATCH] copy sig and lib files also --- main.sh | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/main.sh b/main.sh old mode 100644 new mode 100755 index 3b3ece3..e24c056 --- a/main.sh +++ b/main.sh @@ -2,16 +2,7 @@ #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="" @@ -59,7 +50,7 @@ fi #remove old versions before build - rm "$1*.pkg.tar.xz" + 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) @@ -71,11 +62,13 @@ #copy package to repo directory #latest="$(newold_matching_file n '*.pkg.tar.xz')" - for f in '$1*.pkg.tar.xz' - do - cp $f $REPODIR/$f - repo-add $([ "$SIGN" == "Y" ] && echo "--sign --key $KEY") $REPODIR/$REPONAME.db.tar.xz $REPODIR/$f - done + #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 #TODO: Want to be able to keep multiple versions of old packages, future work @@ -96,7 +89,7 @@ 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 @@ -112,8 +105,16 @@ 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 @@ -175,6 +176,8 @@ 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