Adding 'subtrees' target

diff --git a/Makefile b/Makefile
index 83786249a725457aaa2b70f2adcb05abfa36cf73..7971008a917bc504e0b73b2fd5af13f64ebbc251 100644 (file)
--- 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 c2130711976b525570e9b69a05c64930a42156d5..bc3b32b64a982a2ec2bbe16ba3cd8a34e001dd31 100644 (file)
--- 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 c33e74e9889bd82df0ab2f85fb900a418d1a8c38..f004f2bea732f1a766e0c105a0558cb477f48060 100755 (executable)
--- 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