Misc fixes

diff --git a/share/templater/basic/setup b/share/templater/basic/setup
index 59c23f9fa21f6f6ed206b0cb1db126fb312e6608..cb7b22fc479ca31419734959580a62dfebefa51c 100755 (executable)
--- a/share/templater/basic/setup
+++ b/share/templater/basic/setup
@@ -5,7 +5,7 @@
 
 # Parameters
 SHARE="$1"
-PROJECT="`pwd`"
+PROJECT="$(basename `pwd`)"
 
 # Include basic functions
 source $SHARE/templater/functions || exit 1

diff --git a/share/templater/drupal8/files/Makefile b/share/templater/drupal8/files/Makefile
index ce0eb53ba80645e12255aa6cd89b8205e38955b7..ddedd4823848a2fbb8dad115a66a616a5c9952e2 100644 (file)
--- a/share/templater/drupal8/files/Makefile
+++ b/share/templater/drupal8/files/Makefile
@@ -93,7 +93,7 @@ drush:
 
 # Run drush site-install
 site_install:
-       $(DRUSH) site-install
+       $(DRUSH) site-install -y
 
 # Run drush site-install, sqlite version
 # See https://api.drupal.org/api/drupal/core%21INSTALL.sqlite.txt/8.4.x

diff --git a/share/templater/puppet/setup b/share/templater/puppet/setup
index 5821ae792d6fe28f1d1bda9ab63f077bf076c1de..bb8634b311ade925c53c53306c89a5753069b855 100755 (executable)
--- a/share/templater/puppet/setup
+++ b/share/templater/puppet/setup
@@ -5,7 +5,7 @@
 
 # Parameters
 SHARE="$1"
-PROJECT="`pwd`"
+PROJECT="$(basename `pwd`)"
 BOOTSTRAP="https://git.fluxo.info/puppet-bootstrap"
 
 # Include basic functions

diff --git a/share/templater/wtfpl/setup b/share/templater/wtfpl/setup
index 431763d91599f1edc7da92cf2175518f2e3093e3..ff341182d3c23ed367896c6acb397d6605650302 100755 (executable)
--- a/share/templater/wtfpl/setup
+++ b/share/templater/wtfpl/setup
@@ -5,7 +5,6 @@
 
 # Parameters
 SHARE="$1"
-PROJECT="`pwd`"
 
 # Include basic functions
 source $SHARE/templater/functions || exit 1