Updating hydractl bootstrap

diff --git a/share/hydractl/bootstrap b/share/hydractl/bootstrap
index 735908c896693c8d163e0a89ea598d681697341f..3821dd704590be4541e2394b9b2c927592e4f290 100755 (executable)
--- a/share/hydractl/bootstrap
+++ b/share/hydractl/bootstrap
@@ -21,11 +21,13 @@ STAGE="$1"
 if [ "$STAGE" == "repository" ]; then
   hydractl puppet-install
 
-  rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
-  chown -R puppet. /etc/puppet
-  hydra_bootstrap_config /etc/puppet
+  if [ ! -d "/etc/puppet/.git" ]; then
+    rm -rf /etc/puppet && git clone git://git.sarava.org/puppet-bootstrap /etc/puppet
+    chown -R puppet. /etc/puppet
+    hydra_bootstrap_config /etc/puppet
+  fi
 fi
 
-if [ -e "/etc/puppet/modules/bootstrap/manifests/$stage.pp" ]; then
-  puppet apply /etc/puppet/modules/bootstrap/manifests/$stage.pp
+if [ -e "/etc/puppet/manifests/$stage.pp" ]; then
+  puppet apply /etc/puppet/manifests/$stage.pp
 fi