Skip to content

Commit

Permalink
Tweaking output to remove more passthru. (#941)
Browse files Browse the repository at this point in the history
  • Loading branch information
grasmash authored Jan 9, 2017
1 parent 1ca8066 commit 764b66d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
6 changes: 5 additions & 1 deletion phing/tasks/blt.xml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,18 @@
<!-- Remove default git remote -->
<exec dir="${repo.root}" command="${composer.bin}/yaml-cli update:value ${blt.config-files.project} git.remotes.0 ''" logoutput="true" checkreturn="false" level="${blt.exec_level}" passthru="true"/>

<echo>Updating composer dependencies, this make take a while...</echo>
<echo>Installing new Composer dependencies provided by BLT. This make take a while...</echo>
<exec dir="${repo.root}" command="composer update --no-interaction" logoutput="true" checkreturn="true" level="${blt.exec_level}" passthru="true"/>
<copy file="${repo.root}/docroot/profiles/contrib/lightning/lightning.extend.yml" tofile="${repo.root}/docroot/sites/default/lightning.extend.yml"/>

<phingcall target="create-project:init-repo"/>

<!-- Display BLT art. -->
<exec dir="${repo.root}" command="cat ${blt.root}/scripts/blt/ascii-art.txt" logoutput="true" passthru="true" checkreturn="false"/>

<echo level="warning">Your new BLT-based project has been created in ${repo.root}.</echo>
<echo>Please continue by following the "Creating a new project with BLT" instructions:</echo>
<echo>http://blt.readthedocs.io/en/8.x/readme/creating-new-project/</echo>
</target>

<!-- This target is necessary because Composer will delete .git directory directly after the `composer create-project` -->
Expand Down
2 changes: 1 addition & 1 deletion phing/tasks/setup.xml
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@

<!-- Rebuild caches in case service definitions have changed. -->
<!-- @see https://www.drupal.org/node/2826466 -->
<drush command="cr" alias="${drush.alias}"/>
<drush command="cr" alias="${drush.alias}" passthru="false"/>

<!-- Execute db updates. -->
<!-- This must happen before features are imported or configuration is imported. -->
Expand Down
1 change: 0 additions & 1 deletion tests/phpunit/BltProject/GitTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ protected function assertCommitMessageValidity($is_valid, $commit_message, $mess

// "2>&1" redirects standard error output to standard output.
$command = "mkdir -p {$this->projectDirectory}/tmp && echo '$commit_message' > {$this->projectDirectory}/tmp/blt_commit_msg && {$this->projectDirectory}/.git/hooks/commit-msg {$this->projectDirectory}/tmp/blt_commit_msg 2>&1";
print "Executing \"$command\" \n";

exec($command, $output, $return);
$this->assertNotSame($is_valid, (bool) $return, $message);
Expand Down

0 comments on commit 764b66d

Please sign in to comment.