Also cleanup the scripts a bit to be more consistent, and fail on errors. Signed-off-by: Daniel Nephin <dnephin@docker.com> Upstream-commit: 343d836a95 Component: cli
343d836a95
