Permit csh/fish to be overridden via an explicit `opam config env --sh`.
Permit csh/fish to be overridden via an explicit `opam config env --sh`.

Followup to a11b712225c1a56f5bf3edbb2aaf7f865ec53a11

abate/opam,abate/opam