diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2017-11-14 18:14:55 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2017-11-14 18:14:55 -0200 |
| commit | 5b102f77080b907987afae65a8e7eeb2e12951b1 (patch) | |
| tree | 836153933ff9874731b65614b81309d59817526d /share | |
| parent | ff310529dd0344c27b4000a709a6299ebd3e8994 (diff) | |
| download | templater-5b102f77080b907987afae65a8e7eeb2e12951b1.tar.gz templater-5b102f77080b907987afae65a8e7eeb2e12951b1.tar.bz2 | |
Drupal 8: Makefile: fixes
Diffstat (limited to 'share')
| -rw-r--r-- | share/templater/drupal8/files/Makefile | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile index a24fa50..8c226bb 100644 --- a/share/templater/drupal8/files/Makefile +++ b/share/templater/drupal8/files/Makefile @@ -72,8 +72,8 @@ default_settings: test -s settings.dev.php || cp $(DRUPAL)/sites/default/default.settings.php settings.dev.php test -s services.dev.yml || cp $(DRUPAL)/sites/default/default.services.yml services.dev.yml -# Setup drupal settings -settings: default_settings +# Custom settings +custom_settings: #test -s $(DRUPAL)/sites/sites.php || cp sites.php $(DRUPAL)/sites/sites.php #mkdir -p $(DRUPAL)/sites/$(PROJECT) #test -s $(DRUPAL)/sites/$(PROJECT)/settings.$(ENV).php || cp settings.dev.php $(DRUPAL)/sites/$(PROJECT)/settings.$(ENV).php @@ -82,14 +82,17 @@ settings: default_settings #test -s $(DRUPAL)/sites/$(PROJECT)/services.yml || ln -s services.$(ENV).yml $(DRUPAL)/sites/$(PROJECT)/services.yml #chmod 640 $(DRUPAL)/sites/$(PROJECT)/settings.php #chmod 640 $(DRUPAL)/sites/$(PROJECT)/services.yml - test -s $(DRUPAL)/sites/sites.php || sudo cp sites.php $(DRUPAL)/sites/sites.php - test -s settings.$(ENV).php || cp settings.dev.php settings.$(ENV).php - test -s settings.php || ln -s settings.$(ENV).php settings.php - test -s services.$(ENV).yml || cp services.dev.yml services.$(ENV).yml - test -s services.yml || ln -s services.$(ENV).yml services.yml + test -s settings.$(ENV).php || cp settings.dev.php settings.$(ENV).php + test -s settings.php || ln -s settings.$(ENV).php settings.php + test -s services.$(ENV).yml || cp services.dev.yml services.$(ENV).yml + test -s services.yml || ln -s services.$(ENV).yml services.yml chmod 640 settings.php chmod 640 services.yml +# Setup drupal settings +settings: default_settings custom_settings + test -s $(DRUPAL)/sites/sites.php || sudo cp sites.php $(DRUPAL)/sites/sites.php + # Fix ownership ownership: sudo chown -R $(PROJECT). $(DRUPAL)/sites/$(PROJECT) @@ -117,8 +120,8 @@ updatedb: # Load the database dump, clear the drupal cache and fix image paths # See https://www.drupal.org/node/628130 initdb: - test -s sql/dumps/latest && gzip -dc sql/dumps/latest.sql.gz | $(DRUSH) sql-cli || true - test -s sql/dumps/latest && $(DRUSH) updatedb -y || true + test -s sql/dumps/latest.sql.gz && gzip -dc sql/dumps/latest.sql.gz | $(DRUSH) sql-cli || true + test -s sql/dumps/latest.sql.gz && $(DRUSH) updatedb -y || true # Dump the database dumpdb: |