Merge branch 'master' into 'master'

fix tests

this fixes the copying of APKs in the test script

MANIFEST.in

@@ -24,7 +24,7 @@ include docs/update.sh
 include examples/config.py
 include examples/fdroid-icon.png
 include examples/makebs.config.py
-include tests/run-tests.sh
+include tests/run-tests
 include wp-fdroid/AndroidManifest.xml
 include wp-fdroid/android-permissions.php
 include wp-fdroid/readme.txt

jenkins-build

@@ -39,7 +39,7 @@ cd $WORKSPACE/fdroidserver/getsig
 #------------------------------------------------------------------------------#
 # run local tests
 cd $WORKSPACE/tests
-./run-tests.sh
+./run-tests
 
 
 #------------------------------------------------------------------------------#
@@ -59,7 +59,7 @@ python setup.py install
 
 # run tests in new pip+virtualenv install
 . $WORKSPACE/env/bin/activate
-fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests.sh
+fdroid=$WORKSPACE/env/bin/fdroid $WORKSPACE/tests/run-tests
 
 
 #------------------------------------------------------------------------------#

tests/run-tests

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -e
 set -x
@@ -7,12 +7,10 @@ copy_apks_into_repo() {
     for f in `ls -1 ../../*/bin/*.apk`; do
         name=$(basename $(dirname `dirname $f`))
         echo "name $name"
-        apk=${name}_`basename $f`
+        apk=`aapt d badging "$f" | sed -n "s,^package: name='\(.*\)' versionCode='\([0-9][0-9]*\)' .*,\1_\2.apk,p"`
         echo "apk $apk"
-        cp $f $1/repo/$apk
+        cp -f $f $1/repo/$apk
     done
-    # delete any 'unaligned' duplicates
-    rm -f $1/repo/*unaligned*.apk
 }
 
 if [ -z $WORKSPACE ]; then