3530 Change revert
terminal-run commands into normal commands w/ proper error handling
#3789
+198
−19