From 151ef44072a5913993d0a41df06714adb1070e39 Mon Sep 17 00:00:00 2001
From: Matthew Grasmick <matthew.grasmick@acquia.com>
Date: Tue, 7 Jun 2016 20:59:37 -0400
Subject: [PATCH] Rermoving unneeded files from update scripts.

---
 template/build/core/phing/tasks/setup.xml | 6 +++++-
 template/scripts/blt/update-scaffold      | 2 --
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/template/build/core/phing/tasks/setup.xml b/template/build/core/phing/tasks/setup.xml
index 8b3ce2758..e2395f857 100644
--- a/template/build/core/phing/tasks/setup.xml
+++ b/template/build/core/phing/tasks/setup.xml
@@ -56,7 +56,11 @@
   <target name="setup:drupal:settings" description="Create local settings files using default settings files.">
     <chmod mode="0755" file="${docroot}/sites/default"/>
     <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"/>
+    <copy file="${docroot}/sites/${multisite.name}/default.local.drushrc.php" tofile="${docroot}/sites/${multisite.name}/local.drushrc.php">
+      <filterchain>
+        <expandproperties />
+      </filterchain>
+    </copy>
     <!-- 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" />
diff --git a/template/scripts/blt/update-scaffold b/template/scripts/blt/update-scaffold
index f792f30d2..a3d18d69f 100755
--- a/template/scripts/blt/update-scaffold
+++ b/template/scripts/blt/update-scaffold
@@ -7,7 +7,6 @@ BLT_BRANCH=8.x
 BLT_DIRS=(
   "blt.sh"
   "build/core"
-  "drush.wrapper"
   "factory-hooks/post-settings-php/protect_env.php.example"
   "factory-hooks/pre-settings-php/includes.php.example"
   "hooks/samples"
@@ -31,6 +30,5 @@ done
 
 # Restore execute permissions.
 chmod 755 blt.sh
-chmod 755 drush.wrapper
 
 echo "Changes have been pulled down. Please review and commit desired changes."