From 23a80439cadb4d2e2b6a815429ef7f1a8a781576 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Wed, 27 Jul 2022 14:29:31 -0400
Subject: [PATCH 1/5] add drupal.root value default

---
 targets/install.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index 83fb62ca..65ffaa69 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -68,7 +68,9 @@
             <case value="platformsh">
               <property name="drupal.root" value="web" />
             </case>
-            <default />
+            <default>
+              <property name="drupal.root" value="web" />
+            </default>
         </switch>
 
         <!-- Load the defaults into the global namespace, which won't overwrite the properties the user just set. -->

From 5f4bbf4559ea0ba5f0823e69ad05049a6f3e17da Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Wed, 27 Jul 2022 16:28:53 -0400
Subject: [PATCH 2/5] detect docroot directory first

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index 65ffaa69..ae9be546 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -140,8 +140,8 @@
             <not><equals arg1="${drupal.root.exists}" arg2="1" /></not>
             <then>
                 <!-- The one that's available is the location we're moving from. -->
-                <available file="${build.dir}/web" type="dir" property="drupal.root.old" value="web" />
                 <available file="${build.dir}/docroot" type="dir" property="drupal.root.old" value="docroot" />
+                <available file="${build.dir}/web" type="dir" property="drupal.root.old" value="web" />
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
                 <exec command="mv ${drupal.root.old} ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />

From 60e48f0fa4adf3ad3a7f89423282a08afd344b8a Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Wed, 27 Jul 2022 19:40:02 -0400
Subject: [PATCH 3/5] check for core subdir to determine old drupal root

---
 targets/install.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/targets/install.xml b/targets/install.xml
index ae9be546..4d103dd7 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -134,16 +134,17 @@
          If the drupal.root directory doesn't exist, then we need to move it from the other location (web /
          docroot).-->
     <target name="setup-web-root" depends="set-site">
-        <available file="${build.dir}/${drupal.root}" type="dir" property="drupal.root.exists" value="true" />
+        <available file="${build.dir}/${drupal.root}/core" type="dir" property="drupal.root.exists" value="true" />
 
         <if>
             <not><equals arg1="${drupal.root.exists}" arg2="1" /></not>
             <then>
                 <!-- The one that's available is the location we're moving from. -->
-                <available file="${build.dir}/docroot" type="dir" property="drupal.root.old" value="docroot" />
-                <available file="${build.dir}/web" type="dir" property="drupal.root.old" value="web" />
+                <available file="${build.dir}/web/core" type="dir" property="drupal.root.old" value="web" />
+                <available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
+                <exec command="rm -rf ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />
                 <exec command="mv ${drupal.root.old} ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />
 
                 <echo msg="Editing your composer.json to install Drupal in ${drupal.root}/" />

From 59d7a01b4e26f844ef01d9c01a1b304b51a34c79 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Thu, 28 Jul 2022 08:22:06 -0400
Subject: [PATCH 4/5] allow rm docroot to fail

---
 targets/install.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/targets/install.xml b/targets/install.xml
index 4d103dd7..20c45a98 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -144,7 +144,7 @@
                 <available file="${build.dir}/docroot/core" type="dir" property="drupal.root.old" value="docroot" />
 
                 <echo msg="Moving the ${drupal.root.old}/ directory to ${drupal.root}/" />
-                <exec command="rm -rf ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />
+                <exec command="rm -rf ${drupal.root}" dir="${build.dir}" />
                 <exec command="mv ${drupal.root.old} ${drupal.root}" dir="${build.dir}" checkreturn="true" logoutput="true" />
 
                 <echo msg="Editing your composer.json to install Drupal in ${drupal.root}/" />

From bcdadf901f950022a1fe7c4f3b78602c6c96d714 Mon Sep 17 00:00:00 2001
From: Bec White <white@palantir.net>
Date: Thu, 6 Oct 2022 14:02:46 -0500
Subject: [PATCH 5/5] If there's already a .the-build/build.yml file, allow
 changing the drupal.root (e.g. 'oops I need to reinstall with the right web
 root')

---
 targets/install.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/targets/install.xml b/targets/install.xml
index 20c45a98..ff4da138 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -60,16 +60,16 @@
              that can vary, especially around the host-specific settings.php files. -->
         <switch value="${build.host}">
             <case value="acquia">
-                <property name="drupal.root" value="docroot" />
+                <property name="drupal.root" value="docroot" override="true" />
             </case>
             <case value="pantheon">
-              <property name="drupal.root" value="web" />
+              <property name="drupal.root" value="web" override="true" />
             </case>
             <case value="platformsh">
-              <property name="drupal.root" value="web" />
+              <property name="drupal.root" value="web" override="true" />
             </case>
             <default>
-              <property name="drupal.root" value="web" />
+              <property name="drupal.root" value="web" override="true" />
             </default>
         </switch>