From acdb1e126d0f55cdf3a6f5899b8ed12e7e2836a3 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Tue, 20 Dec 2016 23:14:53 -0600
Subject: [PATCH 1/2] Make the drupal root name and the conf dir location
 configurable in composer-install-elsewhere.

---
 tasks/lib/artifacts.xml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tasks/lib/artifacts.xml b/tasks/lib/artifacts.xml
index 96a2f0a2..b8a3135c 100644
--- a/tasks/lib/artifacts.xml
+++ b/tasks/lib/artifacts.xml
@@ -18,6 +18,11 @@
         <fail unless="drupal.root" />
         <fail unless="drupal.sites_subdir" />
 
+        <!-- Relative path to the Drupal root within the install dir -->
+        <property name="drupal.root_name" value="docroot" />
+        <!-- Path where the conf dir should be copied -->
+        <property name="install_conf_dir" refid="install_dir" />
+
         <!-- Remove all the existing files so that we can install cleanly. -->
         <delete includeemptydirs="true">
             <fileset dir="${install_dir}" />
@@ -40,7 +45,7 @@
                 -->
             <filterchain>
                 <replaceregexp>
-                    <regexp pattern="web(/[^\]]+type:drupal-)" replace="docroot\1" />
+                    <regexp pattern="web(/[^\]]+type:drupal-)" replace="${drupal.root_name}\1" />
                 </replaceregexp>
             </filterchain>
         </copy>
@@ -67,7 +72,7 @@
             -->
         <tempfile property="tmpfile" destdir="${build.dir}/artifacts" />
         <exec command="git ls-files conf" dir="${build.dir}" output="${tmpfile}" />
-        <copy todir="${install_dir}" overwrite="true" haltonerror="true">
+        <copy todir="${install_conf_dir}" overwrite="true" haltonerror="true">
             <filelist dir="${build.dir}" listfile="${tmpfile}" />
         </copy>
         <delete file="${tmpfile}" />

From bd60156341cfaef24dd9fc9e235a77c3acf2228b Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Wed, 21 Dec 2016 00:02:31 -0600
Subject: [PATCH 2/2] Move the slash so that we can install directly into the
 install_dir.

---
 tasks/lib/artifacts.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tasks/lib/artifacts.xml b/tasks/lib/artifacts.xml
index b8a3135c..e24bf2ee 100644
--- a/tasks/lib/artifacts.xml
+++ b/tasks/lib/artifacts.xml
@@ -19,7 +19,7 @@
         <fail unless="drupal.sites_subdir" />
 
         <!-- Relative path to the Drupal root within the install dir -->
-        <property name="drupal.root_name" value="docroot" />
+        <property name="drupal.root_name" value="docroot/" />
         <!-- Path where the conf dir should be copied -->
         <property name="install_conf_dir" refid="install_dir" />
 
@@ -45,7 +45,7 @@
                 -->
             <filterchain>
                 <replaceregexp>
-                    <regexp pattern="web(/[^\]]+type:drupal-)" replace="${drupal.root_name}\1" />
+                    <regexp pattern="web/([^\]]+type:drupal-)" replace="${drupal.root_name}\1" />
                 </replaceregexp>
             </filterchain>
         </copy>