CodeMirror/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-28 23:31:43 +12:00
Code Issues Projects Releases Packages Wiki Activity

Fix shell check fallback not working correctly

Browse source
This commit is contained in:
crschnick 2024-03-23 02:46:52 +00:00
parent 11bebd059a
commit 24b6efed96
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/io/xpipe/app/core/check/AppShellCheck.java
View file

@ -36,6 +36,7 @@ public class AppShellCheck {
}
private static String formatMessage(String output) {
var fallback = !ProcessControlProvider.get().getEffectiveLocalDialect().equals(ProcessControlProvider.get().getFallbackDialect()) ? "XPipe will now attempt to fall back to another shell." : "";
return
"""
Shell self-test failed for %s:
@ -48,13 +49,13 @@ public class AppShellCheck {
- The system shell is restricted or blocked
- Some elementary command-line tools are not available or not working correctly
XPipe will now attempt to fall back to another shell.
%s
"""
.formatted(
ProcessControlProvider.get()
.getEffectiveLocalDialect()
.getDisplayName(),
modifyOutput(output));
modifyOutput(output), fallback);
}
private static void enableFallback() throws Exception {
@ -70,9 +71,9 @@ public class AppShellCheck {
return Optional.of("Expected \"test\", got \"" + out + "\"");
}
} catch (ProcessOutputException ex) {
return Optional.ofNullable(ex.getOutput());
return Optional.of(ex.getOutput() != null ? ex.getOutput() : ex.toString());
} catch (Throwable t) {
return Optional.ofNullable(t.getMessage());
return Optional.of(t.getMessage() != null ? t.getMessage() : t.toString());
}
return Optional.empty();
}