diff options
author | Silvio Rhatto <rhatto@riseup.net> | 2017-10-27 11:04:23 -0200 |
---|---|---|
committer | Silvio Rhatto <rhatto@riseup.net> | 2017-10-27 11:04:23 -0200 |
commit | 18f53deca07e3882f5995f18b1bf646651dd1c63 (patch) | |
tree | 29dbac3c305fd9434d577872de4a954ec04feac5 /templater | |
parent | 415c5c6d45e30614d786c7b545904fa40841c67b (diff) | |
download | templater-18f53deca07e3882f5995f18b1bf646651dd1c63.tar.gz templater-18f53deca07e3882f5995f18b1bf646651dd1c63.tar.bz2 |
Puppet: better puppet integration
Diffstat (limited to 'templater')
-rwxr-xr-x | templater | 14 |
1 files changed, 10 insertions, 4 deletions
@@ -165,10 +165,16 @@ function templater_puppet { __templater___templater_echo "Setting up puppet..." # Use the best approach - #git clone $BOOSTRAP $PROJECT/puppet - #git submodule add $BOOSTRAP puppet - git remote add puppet $BOOTSTRAP - git subtree add --prefix puppet $BOOTSTRAP master --squash + if [ -d '.git' ]; then + #git clone $BOOSTRAP $PROJECT/puppet + #git submodule add $BOOSTRAP puppet + git remote add puppet $BOOTSTRAP + git add . + git commit -m "Commiting changes before running git-subtree" + git subtree add --prefix puppet $BOOTSTRAP master --squash + else + git clone $BOOSTRAP puppet + fi else __templater_echo "Puppet already set" fi |