Projects/bash-ini-parser
1
0
Fork 0
Code Releases Wiki Activity

Change text from 'ignoring' to 'skipping'.

Browse source
This commit is contained in:
Darren 'Tadgy' Austin 2019-07-20 19:21:23 +01:00
commit 8a03e4f96f
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
parse_ini
View file

@ -350,15 +350,15 @@ parse_ini() {
if [[ "${LINE:0:1}" == "[" ]]; then # Found the beginning of a section definition. if [[ "${LINE:0:1}" == "[" ]]; then # Found the beginning of a section definition.
# Check the format of the section definition. # Check the format of the section definition.
if [[ "${LINE: -1:1}" != "]" ]]; then if [[ "${LINE: -1:1}" != "]" ]]; then
echo "${0##*/}: line $LINENUMBER: unmatched [ in section definition - ignoring section" >&2 echo "${0##*/}: line $LINENUMBER: unmatched [ in section definition - skipping section" >&2
IGNORE_SECTION=1 IGNORE_SECTION=1
continue continue
elif [[ "${LINE:1:-1}" =~ [^$ACCEPTABLE_CHARS\[\]]* ]]; then elif [[ "${LINE:1:-1}" =~ [^$ACCEPTABLE_CHARS\[\]]* ]]; then
echo "${0##*/}: line $LINENUMBER: invalid characters in section definition - ignoring section" >&2 echo "${0##*/}: line $LINENUMBER: invalid characters in section definition - skipping section" >&2
IGNORE_SECTION=1 IGNORE_SECTION=1
continue continue
elif [[ -z "${LINE:1:-1}" ]] || [[ "${LINE:1:-1}" =~ ^[[:blank:]]+$ ]]; then elif [[ -z "${LINE:1:-1}" ]] || [[ "${LINE:1:-1}" =~ ^[[:blank:]]+$ ]]; then
echo "${0##*/}: line $LINENUMBER: empty section definition - ignoring section" >&2 echo "${0##*/}: line $LINENUMBER: empty section definition - skipping section" >&2
IGNORE_SECTION=1 IGNORE_SECTION=1
continue continue
else else
@ -393,7 +393,7 @@ parse_ini() {
for SECTION in "${SEEN_SECTIONS[@]}"; do for SECTION in "${SEEN_SECTIONS[@]}"; do
if [[ "$CURRENT_SECTION" == "$SECTION" ]]; then if [[ "$CURRENT_SECTION" == "$SECTION" ]]; then
# It's a section we've seen before - don't process it. # It's a section we've seen before - don't process it.
echo "${0##*/}: line $LINENUMBER: repeated section name - ignoring section" >&2 echo "${0##*/}: line $LINENUMBER: repeated section name - skipping section" >&2
IGNORE_SECTION=1 IGNORE_SECTION=1
continue 2 continue 2
fi fi
@ -415,7 +415,7 @@ parse_ini() {
# Strip the quotes as they're not needed. # Strip the quotes as they're not needed.
LINE="${LINE:1:-1}" LINE="${LINE:1:-1}"
else else
echo "${0##*/}: line $LINENUMBER: unmatched quotes - ignoring property" >&2 echo "${0##*/}: line $LINENUMBER: unmatched quotes - skipping property" >&2
continue continue
fi fi
fi fi
@ -440,7 +440,7 @@ parse_ini() {
if ((USE_BOOLEANS == 1)); then if ((USE_BOOLEANS == 1)); then
printf "%s%s%s[\"%s\"]=\"%s\"\\n" "$PREFIX" "${PREFIX:+$DELIM}" "$CURRENT_SECTION" "$LINE" "$BOOL_VALUE" printf "%s%s%s[\"%s\"]=\"%s\"\\n" "$PREFIX" "${PREFIX:+$DELIM}" "$CURRENT_SECTION" "$LINE" "$BOOL_VALUE"
else else
echo "${0##*/}: line $LINENUMBER: key without a value - ignoring property" >&2 echo "${0##*/}: line $LINENUMBER: key without a value - skipping property" >&2
continue continue
fi fi
elif ((IGNORE_SECTION == 0)); then # Process the property definition as a key/value pair. elif ((IGNORE_SECTION == 0)); then # Process the property definition as a key/value pair.
@ -463,7 +463,7 @@ parse_ini() {
# Strip the quotes as they're not needed. # Strip the quotes as they're not needed.
VALUE="${VALUE:1:-1}" VALUE="${VALUE:1:-1}"
else else
echo "${0##*/}: line $LINENUMBER: unmatched quotes - ignoring property" >&2 echo "${0##*/}: line $LINENUMBER: unmatched quotes - skipping property" >&2
continue continue
fi fi
fi fi