From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 24 Jul 2015 22:52:13 +0000 (-0700)
Subject: run-tests: fix copying of urzip.apk into new repo
X-Git-Tag: 0.4.0~8^2~12
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b8a3bce4303bc9828a672accc3d763b3dc8d0cd7;p=fdroidserver.git

run-tests: fix copying of urzip.apk into new repo
---

diff --git a/tests/run-tests b/tests/run-tests
index 8971bd04..df4d6355 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -343,7 +343,8 @@ $fdroid readmeta
 test -e repo/index.xml
 test -e repo/index.jar
 grep -F '<application id=' repo/index.xml > /dev/null
-cp $WORKSPACE/tests/urzip.apk $REPOROOT/
+test -e $REPOROOT/repo/info.guardianproject.urzip_100.apk || \
+    cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
 $fdroid update --create-metadata
 $fdroid readmeta
 test -e repo/index.xml
@@ -369,8 +370,8 @@ KEYSTORE=$REPOROOT/keystore.jks
 cd $REPOROOT
 touch config.py
 touch fdroid-icon.png
-mkdir repo/
-cp $WORKSPACE/tests/urzip.apk $REPOROOT/
+mkdir repo
+cp $WORKSPACE/tests/urzip.apk $REPOROOT/repo/
 set +e
 $fdroid update --create-metadata
 if [ $? -eq 0 ]; then