From 39c315953f3943f072d6bc8a40ef9b7b2ba9d4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 15 Jun 2013 18:33:24 +0200
Subject: [PATCH 1/2] labels can be on the same line as <application

---
 fdroidserver/common.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c02cda95..380e43de 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -872,7 +872,7 @@ def fetch_real_name(app_dir):
         if not app_found:
             if app_search(line):
                 app_found = True
-        else:
+        if app_found:
             if name is not None:
                 break
             matches = name_search(line)

From 922f570f834de3cf56f1cb33cbb3ddf264a308c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Sat, 15 Jun 2013 19:21:28 +0200
Subject: [PATCH 2/2] Use bash for 'build' as well

---
 fdroidserver/build.py | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 632dd4ee..7086b7e2 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -317,15 +317,15 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d
 
     # Run a build command if one is required...
     if 'build' in thisbuild:
-        prebuild = thisbuild['build']
-        # Substitute source library paths into prebuild commands...
+        cmd = thisbuild['build']
+        # Substitute source library paths into commands...
         for name, libpath in srclibpaths:
             libpath = os.path.relpath(libpath, root_dir)
-            prebuild = prebuild.replace('$$' + name + '$$', libpath)
-        prebuild = prebuild.replace('$$SDK$$', sdk_path)
-        prebuild = prebuild.replace('$$NDK$$', ndk_path)
-        prebuild = prebuild.replace('$$MVN3$$', mvn3)
-        p = subprocess.Popen(prebuild, cwd=root_dir, shell=True,
+            cmd = cmd.replace('$$' + name + '$$', libpath)
+        cmd = cmd.replace('$$SDK$$', sdk_path)
+        cmd = cmd.replace('$$NDK$$', ndk_path)
+        cmd = cmd.replace('$$MVN3$$', mvn3)
+        p = subprocess.Popen(['bash', '-c', cmd], cwd=root_dir,
                 stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         out, err = p.communicate()
         if p.returncode != 0: