denis/sf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

format parsing errors

Browse source
This commit is contained in:
Denis Lehmann 2022-02-05 15:02:29 +01:00
parent ee36b346d3
commit a735473b3f
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.org
View file

File diff suppressed because one or more lines are too long

12
sf
View file

@ -137,7 +137,7 @@ for a in "${sfargs[@]}"; do
[ "${_sfparsearr[3]}" != "" ] && _sfotails+=("${_sfparsearr[4]} (default: ${_sfparsearr[3]})") || _sfotails+=("${_sfparsearr[4]}") [ "${_sfparsearr[3]}" != "" ] && _sfotails+=("${_sfparsearr[4]} (default: ${_sfparsearr[3]})") || _sfotails+=("${_sfparsearr[4]}")
else else
_sferr "Wrong argument declaration: $a" _sferr "Wrong argument declaration: ${sftbf}${a}${sftrs}"
fi fi
done done
@ -163,14 +163,14 @@ for e in "${sfexamples[@]}"; do
_sfetails+=("${_sfparsearr[1]}") _sfetails+=("${_sfparsearr[1]}")
else else
_sferr "Wrong example declaration: $e" _sferr "Wrong example declaration: ${sftbf}${e}${sftrs}"
fi fi
done done
IFS=$OLDIFS IFS=$OLDIFS
# Check if at least one positional argument is set if 'sfparr' is used # Check if at least one positional argument is set if 'sfparr' is used
[ "$sfparr" == true ] && [ "${#_sfpargs[@]}" == 0 ] && _sferr "At least one positional argument must be used with 'sfparr'" [ "$sfparr" == true ] && [ "${#_sfpargs[@]}" == 0 ] && _sferr "At least one positional argument must be used with ${sftbf}sfparr${sftrs}"
# Correct offsets # Correct offsets
_sfpoffset=$(( "_sfpoffset" + 3 )) _sfpoffset=$(( "_sfpoffset" + 3 ))
@ -274,14 +274,14 @@ while (( "$#" )); do
declare "${_sfargs["$1"]//-/_}"="$2" declare "${_sfargs["$1"]//-/_}"="$2"
shift shift
else else
sferr "Argument for '$1' missing" sferr "Argument for ${sftbf}${1}${sftrs} missing"
fi fi
# Handle positional arguments and wrong arguments/flags # Handle positional arguments and wrong arguments/flags
else else
# Check if arg starts with - # Check if arg starts with -
if [ "${1:0:1}" == "-" ]; then if [ "${1:0:1}" == "-" ]; then
sferr "Unsupported argument/flag: $1" sferr "Unsupported argument/flag: ${sftbf}${1}${sftrs}"
else else
# Set positional argument # Set positional argument
if [ "${#_sfpargs[@]}" != 0 ]; then if [ "${#_sfpargs[@]}" != 0 ]; then
@ -304,7 +304,7 @@ done
# Check if positional arguments left # Check if positional arguments left
if [ "${#_sfpargs[@]}" -gt 0 ]; then if [ "${#_sfpargs[@]}" -gt 0 ]; then
for p in "${_sfpargs[@]}"; do for p in "${_sfpargs[@]}"; do
sferr "Positional argument '$p' missing" 0 sferr "Positional argument ${sftbf}${p}${sftrs} missing" 0
done done
exit 1 exit 1
fi fi