From d04177b5126f88d19856204015fea4cde2a09f62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Wed, 27 Apr 2016 14:38:35 +0200 Subject: [PATCH] [fix] Set default path in nginx.conf and fix typo --- scripts/install | 4 ++-- scripts/upgrade | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install b/scripts/install index 5a6bb27..6826433 100644 --- a/scripts/install +++ b/scripts/install @@ -66,7 +66,7 @@ exec_composer www-data "$DESTDIR" require "sblaisot/automatic_addressbook" installed_plugins+=" 'contextmenu', 'automatic_addressbook'," # Update Roundcube configuration -sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ +sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ "${DESTDIR}/config/config.inc.php" ## Install rcmcarddav TODO: if baikal is detected @@ -93,7 +93,7 @@ sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ # Copy and set nginx configuration nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" -sed -i "s@#PATH#@${path}@g" ../conf/nginx.conf +sed -i "s@#PATH#@${path:-/}@g" ../conf/nginx.conf sed -i "s@#DESTDIR#@${DESTDIR}/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf "$nginx_conf" diff --git a/scripts/upgrade b/scripts/upgrade index 1bfc8c7..33d86a8 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -78,7 +78,7 @@ exec_composer www-data "$DESTDIR" require "sblaisot/automatic_addressbook" installed_plugins+=" 'contextmenu', 'automatic_addressbook'," # Update Roundcube configuration -sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ +sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ "$rc_conf" ## Install rcmcarddav if baikal is detected @@ -105,7 +105,7 @@ sudo sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ # Copy and set nginx configuration nginx_conf="/etc/nginx/conf.d/${domain}.d/${app}.conf" -sed -i "s@#PATH#@${path}@g" ../conf/nginx.conf +sed -i "s@#PATH#@${path:-/}@g" ../conf/nginx.conf sed -i "s@#DESTDIR#@${DESTDIR}/@g" ../conf/nginx.conf sudo cp ../conf/nginx.conf "$nginx_conf"