aboutsummaryrefslogtreecommitdiff
path: root/share
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-11-02 15:02:35 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-11-02 15:02:35 -0200
commit1a9ceca69091c76ced7ac520d02789ee4f350cb5 (patch)
tree63f3b5af08b10451b048c4cb1050a8f103eeaea1 /share
parentddb4322c9d4a53ace7e5ab00e131b97832af51a0 (diff)
downloadtemplater-1a9ceca69091c76ced7ac520d02789ee4f350cb5.tar.gz
templater-1a9ceca69091c76ced7ac520d02789ee4f350cb5.tar.bz2
Misc fixes
Diffstat (limited to 'share')
-rwxr-xr-xshare/templater/basic/setup2
-rw-r--r--share/templater/drupal8/files/Makefile2
-rwxr-xr-xshare/templater/puppet/setup2
-rwxr-xr-xshare/templater/wtfpl/setup1
4 files changed, 3 insertions, 4 deletions
diff --git a/share/templater/basic/setup b/share/templater/basic/setup
index 59c23f9..cb7b22f 100755
--- 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 ce0eb53..ddedd48 100644
--- 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 5821ae7..bb8634b 100755
--- 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 431763d..ff34118 100755
--- 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