mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-10 01:00:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 'master'

Browse source 
fix bugs in run-tests scripts

This fixes a couple of subtle bugs in `./run-tests` that only showed up recently.

See merge request !30
This commit is contained in:
Daniel Martí 2014-11-17 17:03:22 +00:00
commit b2f4aa31fe
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tests/run-tests
View file

@ -10,7 +10,7 @@ echo_header() {
copy_apks_into_repo() { copy_apks_into_repo() {
set +x set +x
for f in `find $APKDIR -name '*.apk' | grep -F -v -e unaligned -e unsigned`; do for f in `find $APKDIR -name '*.apk' | grep -F -v -e unaligned -e unsigned -e badsig -e badcert`; do
name=$(basename $(dirname `dirname $f`)) name=$(basename $(dirname `dirname $f`))
apk=`$aapt dump badging "$f" | sed -n "s,^package: name='\(.*\)' versionCode='\([0-9][0-9]*\)' .*,\1_\2.apk,p"` apk=`$aapt dump badging "$f" | sed -n "s,^package: name='\(.*\)' versionCode='\([0-9][0-9]*\)' .*,\1_\2.apk,p"`
test $f -nt repo/$apk && rm -f repo/$apk # delete existing if $f is newer test $f -nt repo/$apk && rm -f repo/$apk # delete existing if $f is newer
@ -46,19 +46,19 @@ create_test_file() {
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# "main" # "main"
if [ $1 = "-h" ] || [ $1 = "--help" ]; then if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
set +x set +x
echo "Usage: $0 '/path/to/folder/with/apks'" echo "Usage: $0 '/path/to/folder/with/apks'"
exit 1 exit 1
fi fi
if [ -z $ANDROID_HOME ]; then if [ -z "$ANDROID_HOME" ]; then
echo "ANDROID_HOME must be set with the path to the Android SDK, i.e.: " echo "ANDROID_HOME must be set with the path to the Android SDK, i.e.: "
echo " export ANDROID_HOME=/opt/android-sdk" echo " export ANDROID_HOME=/opt/android-sdk"
exit 1 exit 1
fi fi
if [ -z $1 ]; then if [ -z "$1" ]; then
APKDIR=`pwd` APKDIR=`pwd`
else else
APKDIR=$1 APKDIR=$1