better support for more shells in gir jira-branch