diff --git a/phing/files/deploy-exclude.txt b/phing/files/deploy-exclude.txt index 2adbbb6a8..8dec33489 100644 --- a/phing/files/deploy-exclude.txt +++ b/phing/files/deploy-exclude.txt @@ -15,7 +15,6 @@ /docroot/sites/*/private /docroot/themes/contrib /drush/contrib -/drush.wrapper /README.md /readme /sites/development.services.yml diff --git a/template/drush.wrapper b/template/drush.wrapper index f38e81b1d..ad3f1153e 100755 --- a/template/drush.wrapper +++ b/template/drush.wrapper @@ -37,4 +37,4 @@ if [ ! -f ${DIR}/vendor/drush/drush/drush.launcher ]; then exit 1 fi -vendor/drush/drush/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases --include=${DIR}/drush "$@" +vendor/drush/drush/drush.launcher --config=${DIR}/drush/drushrc.php --alias-path=${DIR}/drush/site-aliases "$@" diff --git a/template/drush/drushrc.php b/template/drush/drushrc.php index 1d03f085c..47ba52908 100644 --- a/template/drush/drushrc.php +++ b/template/drush/drushrc.php @@ -67,6 +67,14 @@ $options['uri'] = $_ENV['TUGBOAT_URL']; } +// Include current directory. Will add policy.drush.inc. +$options['include'][] = __DIR__; + +// If we are on Acquia Cloud, add Acquia specific commands. +if (file_exists('/usr/local/drush8/commands')) { + $options['include'][] = '/usr/local/drush8/commands'; +} + // Specify the base_url that should be used when generating links # $options['l'] = 'http://example.com/subdir';