aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2010-01-09 14:02:56 -0500
committerDave Reisner <d@falconindy.com>2010-01-09 14:02:56 -0500
commite2359c8c28e56fa4be070926efebbd075e81ea0d (patch)
treedb10ead8a03d913edc76346bbcb5e297da4696a5
parent22ccec8bd6c924e311d476e8cfd44804615b6d4e (diff)
downloadsquashfu-e2359c8c28e56fa4be070926efebbd075e81ea0d.tar.gz
Change parsing of INCLUDES and EXCLUDES to match new heredoc format in config
-rwxr-xr-xsquashfu4
1 files changed, 2 insertions, 2 deletions
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:"