From: Silvio Rhatto <rhatto@riseup.net>
Date: Mon, 3 Mar 2014 17:59:10 +0000 (-0300)
Subject: Adding 'subtrees' target
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=66d41c82b30a511b5dc4d12b9fdcd298b2d8b603;p=puppet-bootstrap.git

Adding 'subtrees' target
---

diff --git a/Makefile b/Makefile
index 8378624..7971008 100644
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,9 @@ modules:
 submodules:
 	bin/submodules
 
+subtrees:
+	bin/subtrees
+
 remote:
 	git remote add bootstrap $(REPO)
 
diff --git a/TODO.md b/TODO.md
index c213071..bc3b32b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,4 +2,3 @@ TODO
 ====
 
 * Make "config" target, refactoring config.pp and default_conf.pp.
-* Make "subtrees" target, including all puppet modules as subtrees.
diff --git a/bin/submodules b/bin/submodules
index c33e74e..f004f2b 100755
--- a/bin/submodules
+++ b/bin/submodules
@@ -19,6 +19,7 @@ repos="`grep = $DIRNAME/../.mrconfig | cut -d = -f 2 | cut -d ' ' -f 4`"
 for repo in $repos; do
   module="`basename $repo .git | sed -e s/^puppet-//`"
   if [ ! -d "modules/$module" ]; then
+    echo "Processing puppet module $module..."
     git submodule add $repo modules/$module
   fi
 done