aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2017-10-24 09:24:17 -0200
committerSilvio Rhatto <rhatto@riseup.net>2017-10-24 09:24:17 -0200
commit5107961a3db5fd862e1924394ba56595fd36d44f (patch)
tree4e66d8e48d001fdf6acb0cacb09ac50fe6d738cc
parent1bfffe2e0adff6e44ec33726988b64f95ea2f599 (diff)
downloaddebian-5107961a3db5fd862e1924394ba56595fd36d44f.tar.gz
debian-5107961a3db5fd862e1924394ba56595fd36d44f.tar.bz2
Squashed 'puppet/' changes from 59b7f11..e4ae97e
e4ae97e Adds copymodules de1a6dc Exclude site_ modules at bin/symlinks git-subtree-dir: puppet git-subtree-split: e4ae97e75dd88884340792795ccfce942a199dae
-rwxr-xr-xbin/copymodules30
-rwxr-xr-xbin/symlinks12
2 files changed, 39 insertions, 3 deletions
diff --git a/bin/copymodules b/bin/copymodules
new file mode 100755
index 0000000..85f7499
--- /dev/null
+++ b/bin/copymodules
@@ -0,0 +1,30 @@
+#!/bin/bash
+#
+# Setup symlinks.
+#
+
+# Parameters
+BASENAME="`basename $0`"
+MODULES="$1"
+
+# Check parameters
+if [ -z "$MODULES" ]; then
+ echo "Usage: $BASENAME <submodules-folder>"
+ exit 1
+elif [ ! -e "$MODULES" ]; then
+ echo "Not found: $MODULES"
+fi
+
+# Add module symlinks using absolute folders
+for module in `ls $MODULES`; do
+ if [ "$module" == "bootstrap" ]; then
+ continue
+ fi
+
+ if echo "$module" | grep -q "^site_"; then
+ continue
+ fi
+
+ path="`cd $MODULES/$module && pwd`"
+ ( cd modules &> /dev/null && cp -r $path . )
+done
diff --git a/bin/symlinks b/bin/symlinks
index 0a221c4..c331261 100755
--- a/bin/symlinks
+++ b/bin/symlinks
@@ -17,8 +17,14 @@ fi
# Add module symlinks using absolute folders
for module in `ls $MODULES`; do
- if [ "$module" != "bootstrap" ]; then
- path="`cd $MODULES/$module && pwd`"
- ( cd modules &> /dev/null && ln -sf $path )
+ if [ "$module" == "bootstrap" ]; then
+ continue
fi
+
+ if echo "$module" | grep -q "^site_"; then
+ continue
+ fi
+
+ path="`cd $MODULES/$module && pwd`"
+ ( cd modules &> /dev/null && ln -sf $path )
done