Merge pull request #121 from grasmash/drupalvm-first

Rermoving unneeded files from update scripts.
acquia · Jun 8, 2016 · 6ca651a · 6ca651a
2 parents b06deea + 151ef44
commit 6ca651a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git 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
@@ -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."