From 798df4a9bc035127432b272c62b5f4cd4a049f75 Mon Sep 17 00:00:00 2001
From: byrond <duvall@palantir.net>
Date: Wed, 25 Jan 2023 10:00:16 -0500
Subject: [PATCH] check for new settings.ddev.php before copy

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

diff --git a/targets/install.xml b/targets/install.xml
index e4b3782b..ad9be0d8 100644
--- a/targets/install.xml
+++ b/targets/install.xml
@@ -142,11 +142,15 @@
                 <!-- The one that's available is the location we're moving from. -->
                 <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" />
-                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+                <available file="${build.dir}/${drupal.root}/sites/default/settings.ddev.php" type="file" property="ddev_settings_exists" value="true" />
+                <available file="${build.dir}/${drupal.root.old}/sites/default/settings.ddev.php" type="file" property="old_ddev_settings_exists" value="true" />
 
                 <!-- Copy settings.ddev.php if it doesn't exist in the old drupal root. -->
                 <if>
-                    <not><equals arg1="${ddev_settings_exists}" arg2="1" /></not>
+                    <and>
+                      <equals arg1="${ddev_settings_exists}" arg2="1" />
+                      <not><equals arg1="${old_ddev_settings_exists}" arg2="1" /></not>
+                    </and>
                     <then>
                         <echo msg="Copying settings.ddev.php to old drupal root." />
                         <exec command="cp ${drupal.root}/sites/default/settings.ddev.php ${drupal.root.old}/sites/default" dir="${build.dir}" checkreturn="true" logoutput="true" />