Added xargs fix to some more wc -l invocations
Calling `xargs` removes any leading whitespace, which is introduced by the macOS version of `wc`. See https://stackoverflow.com/a/12973694/1228454 for more info.pull/1043/head
parent
a4c6a1aaed
commit
3e9c5655b1
|
|
@ -258,17 +258,17 @@ function __migrate_all_components() {
|
||||||
|
|
||||||
ls ${BASH_IT}/${subdirectory}/enabled
|
ls ${BASH_IT}/${subdirectory}/enabled
|
||||||
|
|
||||||
all_available=$(compgen -G "${BASH_IT}/${subdirectory}/available/*.$one_type.bash" | wc -l)
|
all_available=$(compgen -G "${BASH_IT}/${subdirectory}/available/*.$one_type.bash" | wc -l | xargs)
|
||||||
all_enabled_old=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l)
|
all_enabled_old=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l | xargs)
|
||||||
|
|
||||||
assert_equal "$all_available" "$all_enabled_old"
|
assert_equal "$all_available" "$all_enabled_old"
|
||||||
|
|
||||||
run bash-it migrate
|
run bash-it migrate
|
||||||
|
|
||||||
all_enabled_old_after=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l)
|
all_enabled_old_after=$(compgen -G "${BASH_IT}/${subdirectory}/enabled/*.$one_type.bash" | wc -l | xargs)
|
||||||
assert_equal "0" "$all_enabled_old_after"
|
assert_equal "0" "$all_enabled_old_after"
|
||||||
|
|
||||||
all_enabled_new_after=$(compgen -G "${BASH_IT}/enabled/*.$one_type.bash" | wc -l)
|
all_enabled_new_after=$(compgen -G "${BASH_IT}/enabled/*.$one_type.bash" | wc -l | xargs)
|
||||||
assert_equal "$all_enabled_old" "$all_enabled_new_after"
|
assert_equal "$all_enabled_old" "$all_enabled_new_after"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue