From 4ebf3d611acf7eae221c10aee1d01848d8d701cc Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Mon, 21 Sep 2020 12:15:54 +0000 Subject: [PATCH] Fixed init to work on bare VM --- main.sh | 18 ++++++++++-------- 1 files changed, 10 insertions(+), 8 deletions(-) diff --git a/main.sh b/main.sh index 587648e..016623f 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] @@ -66,7 +64,7 @@ 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 @@ -75,12 +73,12 @@ 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 + else echo 1 > $REPODIR/.waitlist.lck tail -n +2 $REPODIR/.waitlist > $REPODIR/.waitlist.tmp cat $REPODIR/.waitlist.tmp > $REPODIR/.waitlist @@ -92,7 +90,7 @@ break else sleep 10 - fi + fi done #Remove old versions of packages @@ -148,6 +146,10 @@ #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 +160,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 +168,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