From 2ea4062c8dd6d9406132d29979163c11c3560823 Mon Sep 17 00:00:00 2001
From: Joel Grunbaum <joelgrun@gmail.com>
Date: Fri, 23 Aug 2019 05:35:10 +0000
Subject: [PATCH] script to fix AUR when files changed locally
---
build.sh | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/build.sh b/build.sh
index 1b1a9f7..062b269 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
{
@@ -143,13 +143,9 @@
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
-<<<<<<< HEAD
-rsync -ah x86_64 $RUSER@$RLOC:$RPATH
-=======
-rsync -ah --delete x86_64 $RUSER@$RLOC:$RPATH
->>>>>>> 019ddc4837c10dc233d49bd517b6f08ef1e53519
+#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