From 86d762dc31655e4677678ec643ab3024f42753e3 Mon Sep 17 00:00:00 2001
From: Chizi123 <build@jsrv.com>
Date: Sun, 20 Sep 2020 23:21:20 +0000
Subject: [PATCH] modified email message
---
main.sh | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 insertions(+), 10 deletions(-)
diff --git a/main.sh b/main.sh
old mode 100644
new mode 100755
index 66cc83e..86de2d6
--- a/main.sh
+++ b/main.sh
@@ -50,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)
@@ -62,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
@@ -86,8 +88,9 @@
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
@@ -103,8 +106,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
@@ -150,6 +161,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 at $(date), please address them soon."
+ echo "The errors were: $ERRORS"
+ ) | sendmail -t
+}
+
case $1 in
"init")
init;;
@@ -160,12 +181,14 @@
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
+ send_email
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