From 39496ca58b0d6e77eed99dbfc68e4d2697f23d0b Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Fri, 22 Oct 2021 20:09:43 +0200
Subject: [PATCH] Change build paths and dirs

---
 Dockerfile         |  1 -
 src/Makefile       | 19 -------------------
 src/update_repo.sh |  9 +++++++--
 3 files changed, 7 insertions(+), 22 deletions(-)
 delete mode 100644 src/Makefile

diff --git a/Dockerfile b/Dockerfile
index dd68348..058aea7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,6 @@ RUN pip install s3cmd
 RUN unlink /usr/bin/apksigner
 ADD src/apksigner.sh /usr/bin/apksigner
 ADD src/update_repo.sh /
-ADD src/Makefile /
 
 ENV UPDATE_WAIT=10
 
diff --git a/src/Makefile b/src/Makefile
deleted file mode 100644
index 67450a1..0000000
--- a/src/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-.PHONY: all
-all: $(TARGET_PATH)/index-v1.jar
-
-$(TARGET_PATH)/index-v1.jar: s3 git
-	fdroid update --use-date-from-apk
-	fdroid signindex
-	fdroid deploy
-	rsync -rlpcgoDv $(REPO_PATH)/ $(TARGET_PATH)/
-
-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)/
-	rsync -rlpcgoDv $(S3_PATH)/*-release.apk $(REPO_PATH)/
diff --git a/src/update_repo.sh b/src/update_repo.sh
index e48f5b6..ae182f5 100755
--- a/src/update_repo.sh
+++ b/src/update_repo.sh
@@ -11,8 +11,13 @@ mkdir -p $WORKDIR
 mkdir -p $REPO_PATH
 mkdir -p $S3_PATH
 cd $WORKDIR
-cp /Makefile $WORKDIR/
 while true; do
-  make S3_PATH=$S3_PATH REPO_PATH=$REPO_PATH TARGET_PATH=$TARGET_PATH GIT_PATH=$GIT_PATH WORKDIR=$WORkDIR
+  rsync -rlpcgoDv --exclude=".*" $GIT_PATH/ $WORKDIR/
+  s3cmd sync --preserve s3://releases/quasseldroid-ng/ $S3_PATH/
+  rsync -rlpcgoDv $S3_PATH/*-release.apk $REPO_PATH/
+  fdroid update --use-date-from-apk
+  fdroid signindex
+  fdroid deploy
+  rsync -rlpcgoDv $REPO_PATH/ $TARGET_PATH/
   sleep $UPDATE_WAIT
 done
-- 
GitLab