Permalink
Browse files

Cmdline fixes

  • Loading branch information...
LadyCailin committed Oct 9, 2018
1 parent 75dc6d0 commit dba776a5919a378df413becec99c4962833957c0
@@ -719,10 +719,15 @@ public void done(String output) {
}
}
}, null, vars);
} catch (CancelCommandException e) {
//Nothing, though we could have been Ctrl+C cancelled, so we need to reset
//the interrupt flag. But we do that unconditionally below, in the finally,
//in the other thread.
env.getEnv(GlobalEnv.class).GetDaemonManager().waitForThreads();
} catch (CancelCommandException | InterruptedException e) {
// Nothing, though we could have been Ctrl+C cancelled, so we need to reset
// the interrupt flag. But we do that unconditionally below, in the finally,
// in the other thread.
// However, interrupt all the underlying threads
for(Thread t : env.getEnv(GlobalEnv.class).GetDaemonManager().getActiveThreads()) {
t.interrupt();
}
} catch (ConfigRuntimeException e) {
ConfigRuntimeException.HandleUncaughtException(e, env);
//No need for the full stack trace
@@ -757,7 +762,6 @@ public void done(String output) {
} catch (InterruptedException ex) {
//
}
} finally {
p.stop();
}
@@ -7,7 +7,7 @@
#To put it back in normal operations, you can run unset DEBUG_MSCRIPT
#on a unix system.
if [ "$#" -eq 0 ]; then
java -jar "%%LOCATION%%" interpreter --location----- $0
java -jar "%%LOCATION%%" interpreter --location----- $(pwd)
else
SCRIPT="$1"
shift 1

0 comments on commit dba776a

Please sign in to comment.