From 46a733bf8137cf574ab3ce84cff220cef3e1c7ea Mon Sep 17 00:00:00 2001 From: Chizi123 <joelgrun@gmail.com> Date: Fri, 23 Aug 2019 01:26:57 +0000 Subject: [PATCH] Merge branch 'master' of https://github.com/Chizi123/Arch-autobuild-repo --- build.sh | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index abc803b..1b1a9f7 100755 --- a/build.sh +++ b/build.sh @@ -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') @@ -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') @@ -148,4 +148,8 @@ git add x86_64 git commit -m "'$(date +%d/%m/%y-%H:%M)'" git push +<<<<<<< HEAD +rsync -ah x86_64 $RUSER@$RLOC:$RPATH +======= rsync -ah --delete x86_64 $RUSER@$RLOC:$RPATH +>>>>>>> 019ddc4837c10dc233d49bd517b6f08ef1e53519 -- Gitblit v1.9.3