Yeah, I’d add a check for `$SHELL` for those lines. The `&&` to `;` change is fine with all shells, AFAIK.