jenkins: update fdroiddata if existing

Also, when cloning, no need to specify the branch and only download that
one. We already have only a single branch. And forcing master isn't
necessary.

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 76a13a25fe7454511760b2fa6a738e89ec339b48..8afa6220b278f5d660dd66c948308ecc0dec623e 100755 (executable)
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -49,10 +49,14 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
 ./makebuildserver
 
 # this can be handled in the jenkins job, or here:
-if [ ! -e fdroiddata ]; then
-    git clone --depth 1 --branch master --single-branch \
-        https://gitlab.com/fdroid/fdroiddata.git fdroiddata
+if [ -e fdroiddata ]; then
+    cd fdroiddata
+    git pull
+    cd ..
+else
+    git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata
 fi
+
 cd fdroiddata
 echo "build_server_always = True" > config.py
 ../fdroid build info.guardianproject.checkey