Make sure these commands are run using sh for #50
Remove some redundant checks that were failing when run from fish and force some to run using sh. Fixes #50