From 5fc1c8b30a1bb6e31864cc0d9f4fd4e1bdb90bdf Mon Sep 17 00:00:00 2001
From: Silvio Rhatto <rhatto@riseup.net>
Date: Fri, 27 Oct 2017 15:07:28 -0200
Subject: Detect puppet folder on scripts

---
 bin/syncmodules | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'bin/syncmodules')

diff --git a/bin/syncmodules b/bin/syncmodules
index 1f5dd07..1585aa4 100755
--- a/bin/syncmodules
+++ b/bin/syncmodules
@@ -15,6 +15,13 @@ elif [ ! -e "$MODULES" ]; then
   echo "Not found: $MODULES"
 fi
 
+# Set puppet folder
+if [ -d "puppet" ]; then
+  PUPPET_FOLDER="puppet"
+else
+  PUPPET_FOLDER="."
+fi
+
 # Add module symlinks using absolute folders
 for module in `ls $MODULES`; do
   if [ "$module" == "bootstrap" ]; then
@@ -26,5 +33,5 @@ for module in `ls $MODULES`; do
   fi
 
   path="`cd $MODULES/$module && pwd`"
-  ( cd modules &> /dev/null && rsync -av --delete $path/ $module/ )
+  ( cd $PUPPET_FOLDER/modules &> /dev/null && rsync -av --delete $path/ $module/ )
 done
-- 
cgit v1.2.3