Log Message:
Fixed "test ==" and some other bugs, as reported in PR 34976. The
quality of the shell scripts is not too good ...