Updates drupal 8 setup

diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile
index ddedd4823848a2fbb8dad115a66a616a5c9952e2..58ce6c420988c6caa891d73e0ad2b9a4ebf19e03 100644 (file)
--- a/share/templater/drupal8/files/Makefile
+++ b/share/templater/drupal8/files/Makefile
@@ -92,12 +92,12 @@ drush:
        sudo drush make -n --no-core drupal.make.yml $(DRUPAL)
 
 # Run drush site-install
-site_install:
+site_install: settings
        $(DRUSH) site-install -y
 
 # Run drush site-install, sqlite version
 # See https://api.drupal.org/api/drupal/core%21INSTALL.sqlite.txt/8.4.x
-site_install_sqlite:
+site_install_sqlite: settings
        mkdir -p sql/.ht.sqlite
        touch sql/dumps/.ht.sqlite
        $(DRUSH) site-install --db-url=sqlite://$(CWD)/sql/dumps/.ht.sqlite

diff --git a/share/templater/drupal8/setup b/share/templater/drupal8/setup
index 415294cc0e3bf41258c3d8550249dbce18f0534a..c276655d4d18b9b5b4bef2850f93cf5cdc48e5e6 100755 (executable)
--- a/share/templater/drupal8/setup
+++ b/share/templater/drupal8/setup
@@ -18,6 +18,7 @@ function templater_drupal8 {
       echo settings.php      >> .gitignore
       echo settings.prod.php >> .gitignore
       echo services.yml      >> .gitignore
+      echo files             >> .gitignore
     fi
 
     if [ ! -e "settings.dev.php" ]; then
@@ -53,7 +54,10 @@ function templater_drupal8 {
     fi
 
     mkdir -p files config themes modules libraries
-    mkdir -p vendor
+    touch {files,config,themes,modules,libraries}/.empty
+    git add -f {files,config,themes,modules,libraries}/.empty
+
+    #mkdir -p vendor
   else
     __templater_echo "Drupal already set"
   fi