From 6c573e87f0e0205157d4af51e776547796d27af1 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 22 Oct 2021 19:45:15 +0200
Subject: [PATCH] Use git in separate path

---
 src/Makefile       | 8 ++++++--
 src/update_repo.sh | 9 ++++++---
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/Makefile b/src/Makefile
index c71a8d9..67450a1 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,14 +1,18 @@
 .PHONY: all
 all: $(TARGET_PATH)/index-v1.jar
 
-$(TARGET_PATH)/index-v1.jar: s3
+$(TARGET_PATH)/index-v1.jar: s3 git
 	fdroid update --use-date-from-apk
 	fdroid signindex
 	fdroid deploy
 	rsync -rlpcgoDv $(REPO_PATH)/ $(TARGET_PATH)/
 
-s3: update_s3
+git: update_git
+.PHONY: update_git
+update_git:
+	rsync -rlpcgoDv --exclude=".*" $(GIT_PATH)/ $(WORKDIR)/
 
+s3: update_s3
 .PHONY: update_s3
 update_s3:
 	s3cmd sync --preserve s3://releases/quasseldroid-ng/ $(S3_PATH)/
diff --git a/src/update_repo.sh b/src/update_repo.sh
index 6dad9d4..1ce60c5 100755
--- a/src/update_repo.sh
+++ b/src/update_repo.sh
@@ -1,16 +1,19 @@
 #!/bin/sh
 SOURCE_PATH=/tmp/fdroid
+GIT_PATH=$SOURCE_PATH/git
+WORKDIR=$SOURCE_PATH/work
 TARGET_PATH=/repo
-REPO_PATH=$SOURCE_PATH/repo
+REPO_PATH=$SOURCE_PATH/work/repo
 S3_PATH=$SOURCE_PATH/s3
 
 mkdir -p $SOURCE_PATH/
 cp /Makefile $SOURCE_PATH/
 
-cd $SOURCE_PATH
+mkdir -p $WORKDIR
 mkdir -p $REPO_PATH
 mkdir -p $S3_PATH
+cd $WORKDIR
 while true; do
-  make S3_PATH=$S3_PATH REPO_PATH=$REPO_PATH TARGET_PATH=$TARGET_PATH
+  make S3_PATH=$S3_PATH REPO_PATH=$REPO_PATH TARGET_PATH=$TARGET_PATH GIT_PATH=$GIT_PATH WORKDIR=$WORkDIR
   sleep $UPDATE_WAIT
 done
-- 
GitLab