diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-11-17 10:13:55 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-11-17 10:13:55 -0200 |
| commit | 2da1b4416c5a8fca5db31e20657c182b8a59376b (patch) | |
| tree | 6b9c1215119caedd1bd51cd421da647ab9036d56 /share/templater/drupal8 | |
| parent | bfa39cbb7f27181980a408a3d9e691cc4f1623c0 (diff) | |
| download | templater-2da1b4416c5a8fca5db31e20657c182b8a59376b.tar.gz templater-2da1b4416c5a8fca5db31e20657c182b8a59376b.tar.bz2 | |
Global Makefile
Diffstat (limited to 'share/templater/drupal8')
| -rw-r--r-- | share/templater/drupal8/files/Makefile.drupal8 (renamed from share/templater/drupal8/files/Makefile) | 2 | ||||
| -rwxr-xr-x | share/templater/drupal8/setup | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile.drupal8 index f424f3e..55375a5 100644 --- a/share/templater/drupal8/files/Makefile +++ b/share/templater/drupal8/files/Makefile.drupal8 @@ -15,7 +15,7 @@ DRUSH = drush -r $(DRUPAL) -l $(PROJECT) # Include local customizations/overrides, which might be .gitignore'd # See https://www.gnu.org/software/make/manual/html_node/Include.html --include Makefile.local +#-include Makefile.local # Setup production environment production: submodules post_receive drush settings ownership diff --git a/share/templater/drupal8/setup b/share/templater/drupal8/setup index 470bae1..fde815e 100755 --- a/share/templater/drupal8/setup +++ b/share/templater/drupal8/setup @@ -22,10 +22,6 @@ function templater_drupal8 { echo sql >> .gitignore fi - if ! grep -q "^Makefile.local" .gitignore; then - echo Makefile.local >> .gitignore - fi - if [ ! -e "settings.dev.php" ]; then cp $SHARE/drupal8/files/default.settings.php settings.dev.php #cp $SHARE/drupal8/files/default.settings.php . @@ -40,13 +36,7 @@ function templater_drupal8 { ln -sf services.dev.yml services.yml - if [ ! -e "Makefile" ]; then - cp $SHARE/drupal8/files/Makefile . - #elif ! grep -q ^drupal: Makefile; then - # grep -v '^#' $SHARE/drupal8/files/Makefile >> Makefile - else - cp $SHARE/drupal8/files/Makefile Makefile.drupal8 - fi + __templater_install_makefile $SHARE/drupal8/files/Makefile.drupal8 if [ ! -e "drupal.make.yml" ]; then cp $SHARE/drupal8/files/drupal.make.yml . |