From e6a5137690fb94f6379499f76a4a07811922a379 Mon Sep 17 00:00:00 2001 From: davidovski Date: Sun, 5 Jun 2022 14:09:43 +0100 Subject: fixed comments not working when preceeded by whitespace --- src/parseconf.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/parseconf.sh b/src/parseconf.sh index abc6b36..d215a99 100644 --- a/src/parseconf.sh +++ b/src/parseconf.sh @@ -16,12 +16,14 @@ EOF # parse a single config file line # parse_line() { - [ $# = "0" ] && return + [ "$#" = 0 ] && return local line="$@" local key=$1 + shift local value="$@" + value=${value%#*} case $key in "include") @@ -108,6 +110,6 @@ $print_keys && pattern="s/^$pattern:(.+)/\1/p;${count}" # strip whitespace -sed "s/^#.*$\|\s(\s\+)\|^\s\|\s^\|;*$//g" $CONF_FILE | +sed "s/^\s*#.*$\|\s(\s\+)\|^\s\|\s^\|;*$//g" $CONF_FILE | parse $@ | sed -rn $pattern -- cgit v1.2.1