Use the latest iRODS build.

Reorganised and tidied script section.