aboutsummaryrefslogtreecommitdiff
path: root/templater
diff options
context:
space:
mode:
Diffstat (limited to 'templater')
-rwxr-xr-xtemplater14
1 files changed, 10 insertions, 4 deletions
diff --git a/templater b/templater
index 1c5d7d6..8061ec8 100755
--- a/templater
+++ b/templater
@@ -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