From 5a43c23b830f40d3ca859a023510bc4f6d1e27ce Mon Sep 17 00:00:00 2001
From: Disassembler <disassembler@dasm.cz>
Date: Mon, 14 Oct 2019 08:29:55 +0200
Subject: [PATCH] Remove cwd magic as it's pkgmgr's responsibility now

---
 apk/vmmgr                                                      | 2 +-
 lxc-apps/ckan/install.sh                                       | 2 --
 lxc-apps/crisiscleanup/install.sh                              | 2 --
 lxc-apps/cts/install.sh                                        | 2 --
 lxc-apps/ecogis/install.sh                                     | 2 --
 lxc-apps/frontlinesms/install.sh                               | 2 --
 lxc-apps/gnuhealth/install.sh                                  | 2 --
 lxc-apps/kanboard/install.sh                                   | 2 --
 lxc-apps/mifosx/install.sh                                     | 2 --
 lxc-apps/motech/install.sh                                     | 2 --
 lxc-apps/odoo/install.sh                                       | 2 --
 lxc-apps/opendatakit/install.sh                                | 2 --
 lxc-apps/openmapkit/install.sh                                 | 2 --
 lxc-apps/pandora/install.sh                                    | 2 --
 lxc-apps/sahana-demo/install.sh                                | 2 --
 lxc-apps/sahana/install.sh                                     | 2 --
 lxc-apps/sambro/install.sh                                     | 2 --
 lxc-apps/seeddms/install.sh                                    | 2 --
 lxc-apps/seeddms/lxc/srv/seeddms/seeddms/utils/seeddms-indexer | 3 ++-
 lxc-apps/sigmah/install.sh                                     | 2 --
 lxc-apps/ushahidi/install.sh                                   | 2 --
 21 files changed, 3 insertions(+), 40 deletions(-)

diff --git a/apk/vmmgr b/apk/vmmgr
index ecfa225..ecb0900 160000
--- a/apk/vmmgr
+++ b/apk/vmmgr
@@ -1 +1 @@
-Subproject commit ecfa2251877abd38e681b0faa35fc4c246723e11
+Subproject commit ecb09001d49ddd160580a1f1de72bb7e06c4179c
diff --git a/lxc-apps/ckan/install.sh b/lxc-apps/ckan/install.sh
index d380064..a5c2b22 100755
--- a/lxc-apps/ckan/install.sh
+++ b/lxc-apps/ckan/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/ckan/postgres_data
 chown -R 105432:105432 /srv/ckan/postgres_data
diff --git a/lxc-apps/crisiscleanup/install.sh b/lxc-apps/crisiscleanup/install.sh
index 92e4e00..69271da 100755
--- a/lxc-apps/crisiscleanup/install.sh
+++ b/lxc-apps/crisiscleanup/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/crisiscleanup/postgres_data
 chown -R 105432:105432 /srv/crisiscleanup/postgres_data
diff --git a/lxc-apps/cts/install.sh b/lxc-apps/cts/install.sh
index bd3f383..bd24524 100755
--- a/lxc-apps/cts/install.sh
+++ b/lxc-apps/cts/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/cts/postgres_data
 chown -R 105432:105432 /srv/cts/postgres_data
diff --git a/lxc-apps/ecogis/install.sh b/lxc-apps/ecogis/install.sh
index d459745..6e38e9b 100755
--- a/lxc-apps/ecogis/install.sh
+++ b/lxc-apps/ecogis/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/ecogis/postgres_data
 chown -R 105432:105432 /srv/ecogis/postgres_data
diff --git a/lxc-apps/frontlinesms/install.sh b/lxc-apps/frontlinesms/install.sh
index 969b28f..c9cb6f5 100755
--- a/lxc-apps/frontlinesms/install.sh
+++ b/lxc-apps/frontlinesms/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Configure FrontlineSMS
 mkdir -p /srv/frontlinesms/flsms_data
 export FRONTLINESMS_ADMIN_USER="admin"
diff --git a/lxc-apps/gnuhealth/install.sh b/lxc-apps/gnuhealth/install.sh
index d76a5c5..b711540 100755
--- a/lxc-apps/gnuhealth/install.sh
+++ b/lxc-apps/gnuhealth/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/gnuhealth/postgres_data
 chown -R 105432:105432 /srv/gnuhealth/postgres_data
diff --git a/lxc-apps/kanboard/install.sh b/lxc-apps/kanboard/install.sh
index b13abe3..b926e20 100755
--- a/lxc-apps/kanboard/install.sh
+++ b/lxc-apps/kanboard/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/kanboard/postgres_data
 chown -R 105432:105432 /srv/kanboard/postgres_data
diff --git a/lxc-apps/mifosx/install.sh b/lxc-apps/mifosx/install.sh
index 2a2a869..4ea9e87 100755
--- a/lxc-apps/mifosx/install.sh
+++ b/lxc-apps/mifosx/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create MariaDB instance
 mkdir -p /srv/mifosx/mariadb_conf /srv/mifosx/mariadb_data
 chown 103306:103306 /srv/mifosx/mariadb_data
diff --git a/lxc-apps/motech/install.sh b/lxc-apps/motech/install.sh
index f44f984..3e35951 100755
--- a/lxc-apps/motech/install.sh
+++ b/lxc-apps/motech/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/motech/postgres_data
 chown -R 105432:105432 /srv/motech/postgres_data
diff --git a/lxc-apps/odoo/install.sh b/lxc-apps/odoo/install.sh
index 3971251..b27773d 100755
--- a/lxc-apps/odoo/install.sh
+++ b/lxc-apps/odoo/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/odoo/postgres_data
 chown -R 105432:105432 /srv/odoo/postgres_data
diff --git a/lxc-apps/opendatakit/install.sh b/lxc-apps/opendatakit/install.sh
index 5def99e..b9dc088 100755
--- a/lxc-apps/opendatakit/install.sh
+++ b/lxc-apps/opendatakit/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/opendatakit/postgres_data
 chown -R 105432:105432 /srv/opendatakit/postgres_data
diff --git a/lxc-apps/openmapkit/install.sh b/lxc-apps/openmapkit/install.sh
index 5964b39..d39c8c1 100755
--- a/lxc-apps/openmapkit/install.sh
+++ b/lxc-apps/openmapkit/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Configure OpenMapKit
 export OPENMAPKIT_ADMIN_USER="admin"
 export OPENMAPKIT_ADMIN_PWD=$(head -c 12 /dev/urandom | base64 | tr -d '+/=')
diff --git a/lxc-apps/pandora/install.sh b/lxc-apps/pandora/install.sh
index 1a4484c..b995190 100755
--- a/lxc-apps/pandora/install.sh
+++ b/lxc-apps/pandora/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/pandora/postgres_data
 chown -R 105432:105432 /srv/pandora/postgres_data
diff --git a/lxc-apps/sahana-demo/install.sh b/lxc-apps/sahana-demo/install.sh
index 9b3d42d..c07c74a 100755
--- a/lxc-apps/sahana-demo/install.sh
+++ b/lxc-apps/sahana-demo/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/sahana-demo/postgres_data
 chown -R 105432:105432 /srv/sahana-demo/postgres_data
diff --git a/lxc-apps/sahana/install.sh b/lxc-apps/sahana/install.sh
index 6f0ae05..3abbd14 100755
--- a/lxc-apps/sahana/install.sh
+++ b/lxc-apps/sahana/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/sahana/postgres_data
 chown -R 105432:105432 /srv/sahana/postgres_data
diff --git a/lxc-apps/sambro/install.sh b/lxc-apps/sambro/install.sh
index 6fa21f7..4597da2 100755
--- a/lxc-apps/sambro/install.sh
+++ b/lxc-apps/sambro/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/sambro/postgres_data
 chown -R 105432:105432 /srv/sambro/postgres_data
diff --git a/lxc-apps/seeddms/install.sh b/lxc-apps/seeddms/install.sh
index b77c141..732b2cb 100755
--- a/lxc-apps/seeddms/install.sh
+++ b/lxc-apps/seeddms/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/seeddms/postgres_data
 chown -R 105432:105432 /srv/seeddms/postgres_data
diff --git a/lxc-apps/seeddms/lxc/srv/seeddms/seeddms/utils/seeddms-indexer b/lxc-apps/seeddms/lxc/srv/seeddms/seeddms/utils/seeddms-indexer
index 42bc537..80e7616 100755
--- a/lxc-apps/seeddms/lxc/srv/seeddms/seeddms/utils/seeddms-indexer
+++ b/lxc-apps/seeddms/lxc/srv/seeddms/seeddms/utils/seeddms-indexer
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-cd $(realpath $(dirname "${0}"))
+# Prevent indexer jobs to run simultaneously by using a file lock
+cd /srv/seeddms/seeddms/utils/
 (
     if ! flock -n 3; then 
         echo "Indexer is still running"
diff --git a/lxc-apps/sigmah/install.sh b/lxc-apps/sigmah/install.sh
index 165c1fd..fa513a1 100755
--- a/lxc-apps/sigmah/install.sh
+++ b/lxc-apps/sigmah/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create Postgres instance
 mkdir -p /srv/sigmah/postgres_data
 chown -R 105432:105432 /srv/sigmah/postgres_data
diff --git a/lxc-apps/ushahidi/install.sh b/lxc-apps/ushahidi/install.sh
index ae68bca..5b5178c 100755
--- a/lxc-apps/ushahidi/install.sh
+++ b/lxc-apps/ushahidi/install.sh
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -ev
 
-cd $(realpath $(dirname "${0}"))/install
-
 # Create MariaDB instance
 mkdir -p /srv/ushahidi/mariadb_conf /srv/ushahidi/mariadb_data
 chown 103306:103306 /srv/ushahidi/mariadb_data