beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-11-21 23:20:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

Improve script init failure message

Browse source
This commit is contained in:
crschnick 2023-12-28 00:57:06 +00:00
parent f689e6a2ea
commit f2c5561eac
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
ext/base/src/main/java/io/xpipe/ext/base/script/ScriptStore.java
View file

@ -31,18 +31,23 @@ public abstract class ScriptStore extends JacksonizedValue implements DataStore,
}
public static ShellControl controlWithScripts(ShellControl pc, List<DataStoreEntryRef<ScriptStore>> initScripts, List<DataStoreEntryRef<ScriptStore>> bringScripts) {
var initFlattened = flatten(initScripts);
var bringFlattened = flatten(bringScripts);
try {
var initFlattened = flatten(initScripts);
var bringFlattened = flatten(bringScripts);
pc.onInit(shellControl -> {
passInitScripts(pc, initFlattened);
pc.onInit(shellControl -> {
passInitScripts(pc, initFlattened);
var dir = initScriptsDirectory(shellControl, bringFlattened);
if (dir != null) {
shellControl.withInitSnippet(new SimpleScriptSnippet(shellControl.getShellDialect().appendToPathVariableCommand(dir), ScriptSnippet.ExecutionType.TERMINAL_ONLY));
}
});
return pc;
var dir = initScriptsDirectory(shellControl, bringFlattened);
if (dir != null) {
shellControl.withInitSnippet(new SimpleScriptSnippet(shellControl.getShellDialect().appendToPathVariableCommand(dir),
ScriptSnippet.ExecutionType.TERMINAL_ONLY));
}
});
return pc;
} catch (Throwable t) {
throw new RuntimeException("Unable to set up scripts", t);
}
}
private static void passInitScripts(ShellControl pc, List<SimpleScriptStore> scriptStores) throws Exception {