From 260bbc7380ad1269eae109f4f48c6d0e623b9de7 Mon Sep 17 00:00:00 2001
From: Geoff Appleby <geoff.a@myplanet.com>
Date: Wed, 6 Jul 2016 09:34:53 -0700
Subject: [PATCH 1/3] Don't overwrite local config files

---
 template/build/core/phing/tasks/setup.xml | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/template/build/core/phing/tasks/setup.xml b/template/build/core/phing/tasks/setup.xml
index 842cb7d14..baaf2d71f 100644
--- a/template/build/core/phing/tasks/setup.xml
+++ b/template/build/core/phing/tasks/setup.xml
@@ -45,13 +45,22 @@
 
   <target name="setup:drupal:settings" description="Create local settings files using default settings files.">
     <chmod mode="0755" file="${docroot}/sites/default" failonerror="false" verbose="true"/>
-    <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" overwrite="false"/>
-    <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" overwrite="false"/>
-    <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php" overwrite="false">
-      <filterchain>
-        <expandproperties />
-      </filterchain>
-    </copy>
+
+    <if>
+      <not>
+        <available file="${repo.root}/project.local.yml" type="file" property="localConfigFilesExist" />
+      </not>
+      <then>
+        <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" />
+        <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
+        <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php">
+          <filterchain>
+            <expandproperties />
+          </filterchain>
+        </copy>
+      </then>
+    </if>
+
     <!-- Re-extract value of $options['uri'] in case it was not yet set. -->
     <!-- @todo Add multisite support. -->
     <phpVariable file="${repo.root}/drush/drushrc.php" variable="options[uri]" outputProperty="local_url" />

From bc47f3c2f7479f51b6334bca41209beae79f0af4 Mon Sep 17 00:00:00 2001
From: Geoff Appleby <geoff.a@myplanet.com>
Date: Wed, 6 Jul 2016 13:52:37 -0700
Subject: [PATCH 2/3] Add condition to copying local settings file in
 properties.xml

---
 template/build/core/phing/tasks/properties.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/template/build/core/phing/tasks/properties.xml b/template/build/core/phing/tasks/properties.xml
index 2dbbe7f7e..174f1a18e 100644
--- a/template/build/core/phing/tasks/properties.xml
+++ b/template/build/core/phing/tasks/properties.xml
@@ -21,7 +21,14 @@
 
   <!-- Extract PHP variable values from local.settings.php. -->
   <property name="local.settings.file" value="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
-  <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${local.settings.file}" overwrite="false" verbose="true"/>
+  <if>
+    <not>
+        <available file="${local.settings.file}" type="file" />
+    </not>
+    <then>
+      <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${local.settings.file}" verbose="true"/>
+    </then>
+  </if>
 
   <echo>Executing commands against multisite "${multisite.name}"</echo>
   <echo>Using settings file ${local.settings.file}</echo>

From d90e46d6c878adceaabba1c58278a5c0c6e7bfa6 Mon Sep 17 00:00:00 2001
From: Geoff Appleby <geoff.a@myplanet.com>
Date: Wed, 6 Jul 2016 13:55:18 -0700
Subject: [PATCH 3/3] Separate condition and copy tasks in
 setup:drupal:settings

---
 template/build/core/phing/tasks/setup.xml | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/template/build/core/phing/tasks/setup.xml b/template/build/core/phing/tasks/setup.xml
index baaf2d71f..eb4ddb7c7 100644
--- a/template/build/core/phing/tasks/setup.xml
+++ b/template/build/core/phing/tasks/setup.xml
@@ -48,11 +48,25 @@
 
     <if>
       <not>
-        <available file="${repo.root}/project.local.yml" type="file" property="localConfigFilesExist" />
+        <available file="${repo.root}/project.local.yml" type="file" />
       </not>
       <then>
         <copy file="${repo.root}/example.project.local.yml" tofile="${repo.root}/project.local.yml" />
+      </then>
+    </if>
+    <if>
+      <not>
+          <available file="${docroot}/sites/${multisite.name}/settings/local.settings.php" type="file" />
+      </not>
+      <then>
         <copy file="${docroot}/sites/${multisite.name}/settings/default.local.settings.php" tofile="${docroot}/sites/${multisite.name}/settings/local.settings.php" />
+      </then>
+    </if>
+    <if>
+      <not>
+          <available file="${docroot}/sites/${multisite.name}/local.drushrc.php" type="file" />
+      </not>
+      <then>
         <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php">
           <filterchain>
             <expandproperties />