(Maint) Simplify search for init scripts
Merge pull request #1672 from dalen/simplify_search

(Maint) Simplify search for init scripts