aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-11-09 12:20:03 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-11-09 12:20:03 -0200
commit5744894605d533e64422de2e512e49c8eb6f3a7d (patch)
tree12365ae9b9ce747895924999119f63b8bf04c45f
parent63013760d7dd90af20fb3ce4dd8a5b751057d463 (diff)
downloadtemplater-5744894605d533e64422de2e512e49c8eb6f3a7d.tar.gz
templater-5744894605d533e64422de2e512e49c8eb6f3a7d.tar.bz2
Updates drupal 8 setup
-rw-r--r--share/templater/drupal8/files/Makefile4
-rwxr-xr-xshare/templater/drupal8/setup6
2 files changed, 7 insertions, 3 deletions
diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile
index ddedd48..58ce6c4 100644
--- 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 415294c..c276655 100755
--- 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