split pkgbuilds
cover more edge cases for install
Merge remote-tracking branch 'upstream/master' into scout