diff --git a/src/Makefile b/src/Makefile index c71a8d9d39de7bf91ecd1c50065a98d3e99a5b16..67450a128be6ca4f6a22b3566af03876a6e25b6d 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 6dad9d49ac7739d4f3a70f9b3b6e08f31b21cbeb..1ce60c5148011be87606089c2a4938e52500650f 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