Fix all ShellCheck warnings

Revert removal of color variable check for grep color option so -C works as advertised