From b5ab414391a4edb72fe6d803f5e2fad1e96dfd6c Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniackc_dev@crudelis.fr>
Date: Fri, 20 Oct 2017 15:14:39 +0200
Subject: [PATCH] fix composer

---
 scripts/_common.sh | 3 ---
 scripts/install    | 2 +-
 scripts/upgrade    | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index baab404..fe755ba 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -26,9 +26,6 @@ init_composer() {
         php -- --quiet --install-dir="$destdir" \
     || ynh_die "Unable to install Composer"
 
-  # install composer.json
-  cp "${destdir}/composer.json-dist" "${destdir}/composer.json"
-
   # update dependencies to create composer.lock
   exec_composer "$destdir" install --no-dev \
     || ynh_die "Unable to update Roundcube core dependencies"
diff --git a/scripts/install b/scripts/install
index 822a3db..9fda0c2 100644
--- a/scripts/install
+++ b/scripts/install
@@ -122,7 +122,7 @@ ynh_store_file_checksum "$final_path/config.inc.php"
 init_composer "$final_path"
 
 # Install dependencies
-exec_composer update --no-dev
+exec_composer "$final_path" update --no-dev
 
 #=================================================
 # GENERIC FINALIZATION
diff --git a/scripts/upgrade b/scripts/upgrade
index 082d6d1..3bd8553 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -138,7 +138,7 @@ ynh_store_file_checksum "$final_path/config.inc.php"
 init_composer "$final_path"
 
 # Install dependencies
-exec_composer update --no-dev
+exec_composer "$final_path" update --no-dev
 
 #=================================================
 # GENERIC FINALIZATION