From e2359c8c28e56fa4be070926efebbd075e81ea0d Mon Sep 17 00:00:00 2001
From: Dave Reisner <d@falconindy.com>
Date: Sat, 9 Jan 2010 14:02:56 -0500
Subject: Change parsing of INCLUDES and EXCLUDES to match new heredoc format
 in config

---
 squashfu | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'squashfu')

diff --git a/squashfu b/squashfu
index b6c7cb2..cc56e34 100755
--- a/squashfu
+++ b/squashfu
@@ -172,8 +172,8 @@ run_rsync() {
     # Gather includes and excludes from config file
     # No error checking here -- user better not have
     # effed up the config
-    INCLUDES=($(grep ^#+ $CONFIG | cut -d+ -f2-))
-    EXCLUDES=($(grep ^#- $CONFIG | cut -d- -f2-))
+    INCLUDES=($(sed -n '/^<<INCLUDES$/,/^INCLUDES$/p' $CONFIG | grep -vE "^<*INCLUDES$"))
+    EXCLUDES=($(sed -n '/^<<EXCLUDES$/,/^EXCLUDES$/p' $CONFIG | grep -vE "^<*EXCLUDES$"))
 
     # rsync source to $BKUP_ROOT/rw
     debug "Rsync executing with:"
-- 
cgit v1.2.3