1 files changed, 14 insertions, 10 deletions
diff --git a/templater b/templater
index 8061ec8..420d661 100755
--- a/templater
+++ b/templater
@@ -164,17 +164,21 @@ function templater_puppet {
   if [ ! -d "puppet" ]; then
     __templater___templater_echo "Setting up puppet..."
 
-    # Use the best approach
-    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
+    if [ ! -d '.git' ]; then
+      __templater_echo "Error: puppet needs a working git setup, skipping"
+      return
+    fi
+
+    if [ "`git status -s | wc -l`" != 0 ]; then
+      __templater_echo "Please commit changes before running setting up puppet"
+      return
     fi
+
+    # Use the best approach
+    #git clone $BOOSTRAP puppet
+    #git submodule add $BOOSTRAP puppet
+    git remote add puppet $BOOTSTRAP
+    git subtree add --prefix puppet $BOOTSTRAP master --squash
   else
     __templater_echo "Puppet already set"
   fi