[PATCH -next 0/2] Add setup/cleanup for run.sh