Updating puppet working copy just if it and it's origin exists

diff --git a/files/update-puppet-conf.sh b/files/update-puppet-conf.sh
index dddae9406ad0fb2ecb4ab79fef2b60168166eee1..b299950e0bcb3ffa84d542eae2452eb51936ec92 100644 (file)
--- a/files/update-puppet-conf.sh
+++ b/files/update-puppet-conf.sh
@@ -10,8 +10,10 @@ ORIGIN_DIR=/var/git/repositories/puppet.git
 
 unset GIT_DIR
 
-cd ${PUPPET_DIR}
-git pull ${ORIGIN_DIR} master
-git checkout -f
-git submodule update --init
-git clean -d -f
+if [ -d "${PUPPET_DIR}/.git" ] && [ -d "${ORIGIN_DIR}" ]; then
+  cd ${PUPPET_DIR}
+  git pull ${ORIGIN_DIR} master
+  git checkout -f
+  git submodule update --init
+  git clean -d -f
+fi