Fix pattern substituion (found with bash3.2.57)

This commit is contained in:
2022-03-22 14:11:45 +01:00
parent ad0f7bd646
commit d20ef76316
2 changed files with 4 additions and 4 deletions

View File

@@ -169,7 +169,7 @@ rl::cleanpath() {
# Remove multiple /
while [[ "${work:-}" = *"//"* ]]; do
work="${work//'//'/'/'}"
work="${work/\/\///}"
done
info " rl::cleanpath result: ${work}"
@@ -191,7 +191,7 @@ rl::normalize() {
# Remove /./ and /.$ sequences.
rex_tmp='/\.(/|$)'
while [[ "$work" =~ $rex_tmp ]]; do
work="${work/"${BASH_REMATCH[0]}"/"${BASH_REMATCH[1]/$//}"}"
work="${work/${BASH_REMATCH[0]}/${BASH_REMATCH[1]/$//}}"
done
# Remove leading ./

View File

@@ -47,7 +47,7 @@ rl::printPath() {
local inputwidth=${config_path_width}
if (( flag_extendedOutput )); then
printf -- "%-3d Inp: %-${config_path_width}s ---" ${testnum} "${input}"
printf -- "%-5d Inp: %-${config_path_width}s ---" ${testnum} "${input}"
else
# Truncate input string on the left if longer than $config_path_width
if (( ${#input} > ${config_path_width} )) ; then
@@ -97,7 +97,7 @@ rl::testcmp() {
printf " %b\n" "${testresult_graphic}"
if (( ! testresult )); then
# Test failed
printf " Result: %s\n Exp: %s\n" "${actual}" "${expect}"
printf " Result: %s\n Exp: %s\n" "${actual}" "${expect}"
if (( flag_verbose )); then
[ -e "${input}" ] && printf "\n Subject:\n" && ls -al "${input}"