Arch-autobuild-repo.git

main / Arch-autobuild-repo

mirror of https://github.com/Chizi123/Arch-autobuild-repo.git

summary
commits
tree
docs
forks
compare

Merge branch 'master' of https://github.com/Chizi123/Arch-autobuild-repo

Chizi123

2019-08-23 46a733bf8137cf574ab3ce84cff220cef3e1c7ea

 build.sh

@@ -5,7 +5,7 @@
#remote details
RUSER=joelgrun
RLOC=35.225.177.191
RPATH=/var/www/joelg.cf/html/
RPATH=/var/www/joelg.cf/html/x86_64/

function newest_matching_file
{
@@ -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

			@@ -5,7 +5,7 @@
			#remote details
			RUSER=joelgrun
			RLOC=35.225.177.191
			RPATH=/var/www/joelg.cf/html/
			RPATH=/var/www/joelg.cf/html/x86_64/

			function newest_matching_file
			{
			@@ -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