From e72b38a05a3fd96ab7b057ebb6b3619867be1496 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Mon, 21 Sep 2020 12:25:51 +0000
Subject: [PATCH] Added comments describing threading
---
main.sh | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 deletions(-)
diff --git a/main.sh b/main.sh
index 587648e..071965c 100755
--- a/main.sh
+++ b/main.sh
@@ -4,8 +4,6 @@
source $(dirname "$(realpath $0)")/vars.sh
-ERRORS=""
-
#Helper for finding newest and oldest files
#Sourced from stack overflow
# Usage: newold_matching_file [n/o] [filename]
@@ -60,13 +58,15 @@
return 1
fi
+ #Move package to repodir and add to repo db
rm $REPODIR/*$1*.pkg.tar.xz*
cp *$1*.pkg.tar.xz $REPODIR/
[ "$SIGN" == "Y" ] && cp *$1*.pkg.tar.xz.sig $REPODIR
+ # Add package to waiting list to be added to repo db
while [ 1 ]; do
if [ $(cat $REPODIR/.waitlist.lck) == 1 ]; then
sleep 1
- else
+ else
echo 1 > $REPODIR/.waitlist.lck
echo $1 >> $REPODIR/.waitlist
echo 0 > $REPODIR/.waitlist.lck
@@ -74,17 +74,17 @@
fi
done
while [ 1 ]; do
+ # Wait until package is at the top of the queue and add to db
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
+ 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
+ else
+ # Remove self from top of queue
echo 1 > $REPODIR/.waitlist.lck
tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp
- cat $REPODIR/.waitlist.tmp > $REPODIR/.waitlist
- rm $REPODIR/.waitlist.tmp
+ mv $REPODIR/.waitlist.tmp $REPODIR/.waitlist
echo 0 > $REPODIR/.waitlist.lck
break
fi
@@ -92,7 +92,7 @@
break
else
sleep 10
- fi
+ fi
done
#Remove old versions of packages
@@ -129,25 +129,33 @@
#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 -f
+ 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 {
- rm -rf $BUILDDIR/$1*
- repo-remove $REPODIR/$REPONAME.db.tar.xz $1
- rm $REPODIR/$1*
+ 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
@@ -158,7 +166,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
@@ -166,7 +174,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"
--
Gitblit v1.9.3