From 41117a7975234976d991ccad151e831614c04e75 Mon Sep 17 00:00:00 2001
From: Chizi123 <joelgrun@gmail.com>
Date: Fri, 23 Aug 2019 01:28:57 +0000
Subject: [PATCH] added script to add package as dependency
---
build.sh | 90 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 77 insertions(+), 13 deletions(-)
diff --git a/build.sh b/build.sh
index 6dfcb3c..8c1b213 100755
--- a/build.sh
+++ b/build.sh
@@ -1,5 +1,12 @@
#!/bin/bash
+#Number of old packages to store, should be at least 1
+NUM_BACK=5
+#remote details
+RUSER=joelgrun
+RLOC=35.225.177.191
+RPATH=/var/www/joelg.cf/html/
+
function newest_matching_file
{
# Use ${1-} instead of $1 in case 'nounset' is set
@@ -34,6 +41,40 @@
return 0
}
+function oldest_matching_file
+{
+ # Use ${1-} instead of $1 in case 'nounset' is set
+ local -r glob_pattern=${1-}
+
+ if (( $# != 1 )) ; then
+ echo 'usage: oldest_matching_file GLOB_PATTERN' >&2
+ return 1
+ fi
+
+ # To avoid printing garbage if no files match the pattern, set
+ # 'nullglob' if necessary
+ local -i need_to_unset_nullglob=0
+ if [[ ":$BASHOPTS:" != *:nullglob:* ]] ; then
+ shopt -s nullglob
+ need_to_unset_nullglob=1
+ fi
+
+ oldest_file=
+ for file in $glob_pattern ; do
+ [[ -z $oldest_file || $file -ot $oldest_file ]] \
+ && oldest_file=$file
+ done
+
+ # To avoid unexpected behaviour elsewhere, unset nullglob if it was
+ # set by this function
+ (( need_to_unset_nullglob )) && shopt -u nullglob
+
+ # Use printf instead of echo in case the file name begins with '-'
+ [[ -n $oldest_file ]] && printf '%s\n' "$oldest_file"
+
+ return 0
+}
+
#update system
sudo pacman -Syu --noconfirm
@@ -41,8 +82,9 @@
cd $(dirname "$(realpath $0)")
#Remove old packages
-git rm -r x86_64/*
-mkdir x86_64
+#git rm -r x86_64/*
+#rm -r x86_64
+#mkdir x86_64
#dependencies
cd dependencies
@@ -54,12 +96,22 @@
fi
cd $d
#update package to latest from AUR
- git pull
+ git pull -f
makepkg -si --noconfirm
- latest=$(newest_matching_file '*.pkg.tar.xz')
- cd ..
- ln $d/$latest ../x86_64/$latest
- repo-add ../Chizi123.db.tar.xz ../x86_64/$latest
+ if [ $? = 0 ]; then
+ latest=$(newest_matching_file '*.pkg.tar.xz')
+ while [ $NUM_BACK \< $(find . -name "*.pkg.tar.xz" | wc -l) ]
+ do
+ oldest=$(oldest_matching_file '*.pkg.tar.xz')
+ rm $oldest
+ done
+ cd ..
+ rm ../x86_64/"$d"*".pkg.tar.xz"
+ ln $d/$latest ../x86_64/$latest
+ else
+ cd ..
+ fi
+ # repo-add ../Chizi123.db.tar.xz ../x86_64/$latest
done
cd ..
@@ -67,21 +119,33 @@
for d in `find . -maxdepth 1 -not -path '*/\.*' -type d`
do
#Only do package directories
- if [ "$d" = "./x86_64" ] || [ "$d" = "." ] || [ "$d" = "dependencies" ]; then
+ if [ "$d" = "./x86_64" ] || [ "$d" = "." ] || [ "$d" = "./dependencies" ]; then
continue
fi
cd $d
#update package to latest from AUR
- git pull
+ git pull -f
makepkg -s --noconfirm
- latest=$(newest_matching_file '*.pkg.tar.xz')
- cd ..
- ln $d/$latest x86_64/$latest
- repo-add ./Chizi123.db.tar.xz x86_64/$latest
+ if [ $? = 0 ]; then
+ latest=$(newest_matching_file '*.pkg.tar.xz')
+ while [ $NUM_BACK \< $(find . -name "*.pkg.tar.xz" | wc -l) ]
+ do
+ oldest=$(oldest_matching_file '*.pkg.tar.xz')
+ rm $oldest
+ done
+ cd ..
+ rm x86_64/"$d"*".pkg.tar.xz"
+ ln $d/$latest x86_64/$latest
+ else
+ cd ..
+ fi
+ # repo-add ./Chizi123.db.tar.xz x86_64/$latest
done
+repo-add Chizi123.db.tar.xz x86_64/*
ln Chizi123.db.tar.xz x86_64/Chizi123.db
ln Chizi123.files.tar.xz x86_64/Chizi123.files
git add x86_64
git commit -m "'$(date +%d/%m/%y-%H:%M)'"
git push
+rsync -ah --delete x86_64 $RUSER@$RLOC:$RPATH
--
Gitblit v1.9.3