From 41b598936fcf00713bf5ec91c3b38029c0b3e20c Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Thu, 13 Sep 2018 13:59:56 +0200
Subject: [PATCH] Fix fix-apk dropping last package

---
 build-all.sh     | 7 +++++++
 zz-extra/fix-apk | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/build-all.sh b/build-all.sh
index f4b225c..8cf3b8a 100755
--- a/build-all.sh
+++ b/build-all.sh
@@ -31,6 +31,13 @@ lxc-build ${SOURCE_DIR}/ckan-datapusher
 lxc-build ${SOURCE_DIR}/crisiscleanup
 lxc-build ${SOURCE_DIR}/cts
 lxc-build ${SOURCE_DIR}/frontlinesms
+lxc-build ${SOURCE_DIR}/gnuhealth
+lxc-build ${SOURCE_DIR}/kanboard
+lxc-build ${SOURCE_DIR}/mariadb
+lxc-build ${SOURCE_DIR}/mifosx
+lxc-build ${SOURCE_DIR}/motech
+lxc-build ${SOURCE_DIR}/opendatakit
+lxc-build ${SOURCE_DIR}/opendatakit-build
 lxc-build ${SOURCE_DIR}/postgres
 lxc-build ${SOURCE_DIR}/redis
 lxc-build ${SOURCE_DIR}/solr
diff --git a/zz-extra/fix-apk b/zz-extra/fix-apk
index 0b9199d..b95c0e6 100755
--- a/zz-extra/fix-apk
+++ b/zz-extra/fix-apk
@@ -16,6 +16,9 @@ def fix_installed(layers):
                             installed.append(buffer)
                         buffer = []
                     buffer.append(line)
+                buffer = ''.join(buffer)
+                if buffer not in installed:
+                    installed.append(buffer)
         except:
             continue
     os.makedirs(os.path.join(layers[-1], 'lib/apk/db'), 0o755, True)