mirror of
https://github.com/xpipe-io/xpipe.git
synced 2025-04-19 02:33:39 +00:00
Rework
This commit is contained in:
parent
0b52976f40
commit
0ff3808eef
6 changed files with 21 additions and 8 deletions
|
@ -53,7 +53,7 @@ dependencies {
|
|||
api 'org.bouncycastle:bcprov-jdk18on:1.80'
|
||||
api 'info.picocli:picocli:4.7.6'
|
||||
api 'org.apache.commons:commons-lang3:3.17.0'
|
||||
api 'io.sentry:sentry:7.20.0'
|
||||
api 'io.sentry:sentry:8.7.0'
|
||||
api 'commons-io:commons-io:2.18.0'
|
||||
api group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: "2.18.3"
|
||||
api group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: "2.18.3"
|
||||
|
|
|
@ -198,7 +198,7 @@ public class ModalOverlayComp extends SimpleComp {
|
|||
}
|
||||
}
|
||||
content.getChildren().add(buttonBar);
|
||||
AppFontSizes.sm(buttonBar);
|
||||
AppFontSizes.base(buttonBar);
|
||||
}
|
||||
|
||||
var modalBox = new ModalBox(pane, content) {
|
||||
|
|
|
@ -6,6 +6,7 @@ import io.xpipe.core.process.ShellControl;
|
|||
import io.xpipe.core.process.ShellDialects;
|
||||
|
||||
import lombok.Getter;
|
||||
import lombok.SneakyThrows;
|
||||
|
||||
public class LocalShell {
|
||||
|
||||
|
@ -55,7 +56,8 @@ public class LocalShell {
|
|||
return local != null;
|
||||
}
|
||||
|
||||
public static ShellControl getShell() throws Exception {
|
||||
@SneakyThrows
|
||||
public static ShellControl getShell() {
|
||||
if (local == null) {
|
||||
throw new IllegalStateException("Local shell not initialized yet");
|
||||
}
|
||||
|
|
|
@ -148,6 +148,7 @@ project.ext {
|
|||
"--add-opens", "org.apache.commons.io/org.apache.commons.io.input=io.xpipe.ext.proc",
|
||||
"--add-opens", "net.synedra.validatorfx/net.synedra.validatorfx=io.xpipe.app",
|
||||
"--add-opens", "java.base/java.nio.file=io.xpipe.app",
|
||||
"--add-opens", "java.base/java.lang=io.xpipe.app",
|
||||
"--add-exports", "javafx.graphics/com.sun.javafx.tk=io.xpipe.app",
|
||||
"--add-exports", "jdk.zipfs/jdk.nio.zipfs=io.xpipe.modulefs",
|
||||
"--add-opens", "javafx.graphics/com.sun.glass.ui=io.xpipe.app",
|
||||
|
|
2
dist/licenses/sentry.properties
generated
vendored
2
dist/licenses/sentry.properties
generated
vendored
|
@ -1,4 +1,4 @@
|
|||
name=Sentry Java
|
||||
version=7.20.0
|
||||
version=8.7.0
|
||||
license=MIT License
|
||||
link=https://github.com/getsentry/sentry-java
|
|
@ -5,10 +5,7 @@ import io.xpipe.app.storage.ContextualFileReference;
|
|||
import io.xpipe.app.storage.DataStorage;
|
||||
import io.xpipe.app.util.SecretRetrievalStrategy;
|
||||
import io.xpipe.app.util.Validators;
|
||||
import io.xpipe.core.process.CommandBuilder;
|
||||
import io.xpipe.core.process.OsType;
|
||||
import io.xpipe.core.process.ShellControl;
|
||||
import io.xpipe.core.process.ShellDialects;
|
||||
import io.xpipe.core.process.*;
|
||||
import io.xpipe.core.store.FileNames;
|
||||
import io.xpipe.core.util.ValidationException;
|
||||
|
||||
|
@ -331,6 +328,19 @@ public interface SshIdentityStrategy {
|
|||
@AllArgsConstructor
|
||||
class YubikeyPiv implements SshIdentityStrategy {
|
||||
|
||||
public static String getDefaultSharedLibrary() {
|
||||
var file =
|
||||
switch (OsType.getLocal()) {
|
||||
case OsType.Linux linux -> "/usr/local/lib/libykcs11.so";
|
||||
case OsType.MacOs macOs -> "/usr/local/lib/libykcs11.dylib";
|
||||
case OsType.Windows windows -> {
|
||||
var x64 = "C:\\Program Files\\Yubico\\Yubico PIV Tool\\bin\\libykcs11.dll";
|
||||
yield x64;
|
||||
}
|
||||
};
|
||||
return file;
|
||||
}
|
||||
|
||||
private String getFile(ShellControl parent) throws Exception {
|
||||
var file =
|
||||
switch (parent.getOsType()) {
|
||||
|
|
Loading…
Add table
Reference in a new issue