aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2014-03-03 14:59:10 -0300
committerSilvio Rhatto <rhatto@riseup.net>2014-03-03 14:59:10 -0300
commit66d41c82b30a511b5dc4d12b9fdcd298b2d8b603 (patch)
treefe67c0985dcf1b112763eb64c216c60838bc077d
parent6b42c1987fe568b1331ce369f0426c3dab76953a (diff)
downloadpuppet-bootstrap-66d41c82b30a511b5dc4d12b9fdcd298b2d8b603.tar.gz
puppet-bootstrap-66d41c82b30a511b5dc4d12b9fdcd298b2d8b603.tar.bz2
Adding 'subtrees' target
-rw-r--r--Makefile3
-rw-r--r--TODO.md1
-rwxr-xr-xbin/submodules1
3 files changed, 4 insertions, 1 deletions
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