Refactor run script
Refactor run script

This cleans up the nested if/else and also allows a fall through.

openjck/distribution-viewer,openjck/distribution-viewer,openjck/distribution-viewer,openjck/distribution-viewer