From f9958bf7b1694b7a3dd1b431323b798debf46281 Mon Sep 17 00:00:00 2001 From: Joel Grunbaum <joelgrun@gmail.com> Date: Fri, 23 Aug 2019 06:17:03 +0000 Subject: [PATCH] glob adding didn't work --- build.sh | 23 +++++++++++------------ 1 files changed, 11 insertions(+), 12 deletions(-) diff --git a/build.sh b/build.sh index 6dd1d7e..02e42f0 100755 --- a/build.sh +++ b/build.sh @@ -5,7 +5,7 @@ #remote details RUSER=joelgrun RLOC=35.225.177.191 -RPATH=/var/www/joelg.cf/html/x86_64/ +RPATH=/var/www/joelg.cf/html/ function newest_matching_file { @@ -96,7 +96,7 @@ fi cd $d #update package to latest from AUR - git pull + git pull -f makepkg -si --noconfirm if [ $? = 0 ]; then latest=$(newest_matching_file '*.pkg.tar.xz') @@ -111,7 +111,7 @@ else cd .. fi - # repo-add ../Chizi123.db.tar.xz ../x86_64/$latest + repo-add ../Chizi123.db.tar.xz ../x86_64/$latest done cd .. @@ -124,7 +124,7 @@ fi cd $d #update package to latest from AUR - git pull + git pull -f makepkg -s --noconfirm if [ $? = 0 ]; then latest=$(newest_matching_file '*.pkg.tar.xz') @@ -139,13 +139,12 @@ else cd .. fi - # repo-add ./Chizi123.db.tar.xz x86_64/$latest + 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 x86_64 $RUSER@$RLOC:$RPATH +#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 -aL --delete x86_64 $RUSER@$RLOC:$RPATH -- Gitblit v1.9.3