Don't use -P option for type command
Set environment variable by :=
Quote arguments
Merge branch 'more-sh-support'