From d2d60eb8bdd4f568fd51cbbad250348d8859932c Mon Sep 17 00:00:00 2001
From: Janos SUTO <sj@acts.hu>
Date: Fri, 15 Nov 2019 15:50:31 +0100
Subject: [PATCH] Fixed envsubst command in postinstall script

Signed-off-by: Janos SUTO <sj@acts.hu>
---
 util/config-site.php.in | 28 ++++++++++++++--------------
 util/postinstall.sh.in  |  6 +++---
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/util/config-site.php.in b/util/config-site.php.in
index 4665414a..f37ba616 100644
--- a/util/config-site.php.in
+++ b/util/config-site.php.in
@@ -1,19 +1,19 @@
 <?php
 
-$config['SITE_NAME'] = '$HOSTNAME';
-$config['SITE_URL'] = 'http://' . $config['SITE_NAME'] . '/';
-$config['DIR_BASE'] = '$DOCROOT/';
+config['SITE_NAME'] = '$HOSTNAME';
+config['SITE_URL'] = 'http://' . config['SITE_NAME'] . '/';
+config['DIR_BASE'] = '$DOCROOT/';
 
-$config['SMTP_DOMAIN'] = '$HOSTNAME';
-$config['SMTP_FROMADDR'] = 'no-reply@' . $config['SMTP_DOMAIN'];
-$config['ADMIN_EMAIL'] = 'admin@' . $config['SMTP_DOMAIN'];
+config['SMTP_DOMAIN'] = '$HOSTNAME';
+config['SMTP_FROMADDR'] = 'no-reply@' . config['SMTP_DOMAIN'];
+config['ADMIN_EMAIL'] = 'admin@' . config['SMTP_DOMAIN'];
 
-$config['DB_DRIVER'] = 'mysql';
-$config['DB_PREFIX'] = '';
-$config['DB_HOSTNAME'] = '$MYSQL_HOSTNAME';
-$config['DB_USERNAME'] = '$MYSQL_USERNAME';
-$config['DB_PASSWORD'] = '$MYSQL_PASSWORD';
-$config['DB_DATABASE'] = '$MYSQL_DATABASE';
+config['DB_DRIVER'] = 'mysql';
+config['DB_PREFIX'] = '';
+config['DB_HOSTNAME'] = '$MYSQL_HOSTNAME';
+config['DB_USERNAME'] = '$MYSQL_USERNAME';
+config['DB_PASSWORD'] = '$MYSQL_PASSWORD';
+config['DB_DATABASE'] = '$MYSQL_DATABASE';
 
-$config['SMARTHOST'] = '$SMARTHOST';
-$config['SMARTHOST_PORT'] = '$SMARTHOST_PORT';
+config['SMARTHOST'] = '$SMARTHOST';
+config['SMARTHOST_PORT'] = '$SMARTHOST_PORT';
diff --git a/util/postinstall.sh.in b/util/postinstall.sh.in
index 0b23e2d0..f6c276ba 100755
--- a/util/postinstall.sh.in
+++ b/util/postinstall.sh.in
@@ -401,16 +401,16 @@ SOCKHELPER
    fi
 
 
-   if [ -d "$DOCROOT" ]; then webui_install; fi
+   if [[ -d "$DOCROOT" ]]; then webui_install; fi
 
 }
 
 
 webui_install() {
    chmod 770 "${DOCROOT}/tmp" "${DOCROOT}/images"
-   chown "${PILERUSER}:${DOCROOT}" "${DOCROOT}/tmp"
+   chown "$PILERUSER" "${DOCROOT}/tmp"
 
-   envsubst "${SCRIPT_DIR}/config-site.php.in" > "$CONFIG_SITE_PHP"
+   envsubst < "${SCRIPT_DIR}/config-site.php.in" | sed s%config%\$config%g > "$CONFIG_SITE_PHP"
 
    echo "Done."
 }