Skip to content

Commit

Permalink
Adding docroot to drush.wrapper. (#209)
Browse files Browse the repository at this point in the history
* Adding docroot to drush.wrapper.

* Fixing PHPCS violation.

* Fixing incorrect grep usage in removal of git artifacts.
  • Loading branch information
grasmash authored Jul 6, 2016
1 parent 519e141 commit 42b5004
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 3 deletions.
2 changes: 2 additions & 0 deletions build/phing/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@
<echo>4. Run the following command from the new project root:</echo>
<echo>./blt.sh local:setup</echo>
<echo></echo>
<echo>Follow the documentation in ${blt.new.dir}/README.md for anything else.</echo>
<echo></echo>
</target>

<!-- This target is meant to test BLT itself on TravisCI.
Expand Down
4 changes: 2 additions & 2 deletions template/build/core/phing/tasks/deploy.xml
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,8 @@
</target>

<target name="deploy:sanitize" description="Removes sensitive files from the deploy docroot.">
<exec command="find . -type d | grep .git | xargs rm -rf" dir="${deploy.dir}/docroot"/>
<exec command="find . -type d | grep .git | xargs rm -rf" dir="${deploy.dir}/vendor"/>
<exec command="find . -type d | grep '\.git' | xargs rm -rf" dir="${deploy.dir}/docroot"/>
<exec command="find . -type d | grep '\.git' | xargs rm -rf" dir="${deploy.dir}/vendor"/>
<delete>
<fileset dir="${deploy.dir}/docroot">
<include name="core/*.txt"/>
Expand Down
2 changes: 1 addition & 1 deletion template/drush.wrapper
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ if [ ! -f ${DIR}/vendor/bin/drush ]; then
composer install
fi

vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@"
vendor/bin/drush.launcher --alias-path=${DIR}/drush/site-aliases "$@" -r ${DIR}/docroot
1 change: 1 addition & 0 deletions template/tests/phpunit/Bolt/SettingsTest.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php

namespace Drupal\Tests\PHPUnit;

/**
* Class SettingsTest.
*
Expand Down

0 comments on commit 42b5004

Please sign in to comment.