Drupal 8: minor Makefile changes

2 files changed, 33 insertions, 1 deletions

diff --git a/share/drupal8/Makefile b/share/drupal8/Makefile
index 3ba982f..dec93d3 100644
--- a/share/drupal8/Makefile
+++ b/share/drupal8/Makefile
@@ -118,6 +118,8 @@ reinitdb: destroydb initdb
 clean:
 	vagrant halt
 	vagrant destroy -f
+	kvmx stop
+	kvmx destroy
 	rm -rf vendor/drupal*
 
 # Export configuration
@@ -142,7 +144,7 @@ upgrade-modules:
 
 # Upgrade drupal
 upgrade-drupal:
-	BASE=/vagrant/vendor drupal upgrade $(OLD) $(NEW)
+	BASE=$(DESTDIR) drupal upgrade $(OLD) $(NEW)
 
 # Configure update hook on remote host
 post_receive:
diff --git a/templater b/templater
index 402af36..66413fc 100755
--- a/templater
+++ b/templater
@@ -343,6 +343,36 @@ function templater_drupal8 {
   fi
 }
 
+# GPLv3 License
+function templater_gpl {
+  if [ ! -e "LICENSE" ]; then
+    __templater_echo "Setting up GPLv3 license..."
+    cp $DIRNAME/share/gpl/LICENSE .
+  else
+    __templater_echo "LICENSE already set"
+  fi
+}
+
+# AGPLv3 License
+function templater_agpl {
+  true
+}
+
+# MIT License
+function templater_mit {
+  true
+}
+
+# Apache License
+function templater_apache {
+  true
+}
+
+# BSD License
+function templater_bsd {
+  true
+}
+
 # Syntax check
 if [ -z "$PROJECT" ]; then
   echo "$BASENAME: create a new project folder and/or setup helper utilities"