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

Fixes

Browse source
This commit is contained in:
crschnick 2024-11-17 11:47:44 +00:00
parent e76371518f
commit 7577ce9c1a
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -67,7 +67,7 @@ dependencies {
api group: 'org.kordamp.ikonli', name: 'ikonli-feather-pack', version: "12.2.0" api group: 'org.kordamp.ikonli', name: 'ikonli-feather-pack', version: "12.2.0"
api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16' api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.16'
api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.16' api group: 'org.slf4j', name: 'slf4j-jdk-platform-logging', version: '2.0.16'
api 'io.xpipe:modulefs:0.1.5' api 'io.xpipe:modulefs:0.1.6'
api 'net.synedra:validatorfx:0.4.2' api 'net.synedra:validatorfx:0.4.2'
api files("$rootDir/gradle/gradle_scripts/atlantafx-base-2.0.2.jar") api files("$rootDir/gradle/gradle_scripts/atlantafx-base-2.0.2.jar")
} }

1
build.gradle
View file

@ -134,6 +134,7 @@ project.ext {
"--add-opens", "net.synedra.validatorfx/net.synedra.validatorfx=io.xpipe.app", "--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.nio.file=io.xpipe.app",
"--add-exports", "javafx.graphics/com.sun.javafx.tk=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", "--add-opens", "javafx.graphics/com.sun.glass.ui=io.xpipe.app",
"--add-opens", "javafx.graphics/javafx.stage=io.xpipe.app", "--add-opens", "javafx.graphics/javafx.stage=io.xpipe.app",
"--add-opens", "javafx.graphics/com.sun.javafx.tk.quantum=io.xpipe.app", "--add-opens", "javafx.graphics/com.sun.javafx.tk.quantum=io.xpipe.app",

6
core/src/main/java/io/xpipe/core/util/XPipeInstallation.java
View file

@ -259,6 +259,12 @@ public class XPipeInstallation {
public static String getLocalDefaultInstallationBasePath(boolean stage) { public static String getLocalDefaultInstallationBasePath(boolean stage) {
String path; String path;
if (OsType.getLocal().equals(OsType.WINDOWS)) { if (OsType.getLocal().equals(OsType.WINDOWS)) {
var pg = System.getenv("ProgramFiles");
var systemPath = Path.of(pg,stage ? "XPipe PTB" : "XPipe");
if (Files.exists(systemPath)) {
return systemPath.toString();
}
var base = System.getenv("LOCALAPPDATA"); var base = System.getenv("LOCALAPPDATA");
path = FileNames.join(base, stage ? "XPipe PTB" : "XPipe"); path = FileNames.join(base, stage ? "XPipe PTB" : "XPipe");
} else if (OsType.getLocal().equals(OsType.LINUX)) { } else if (OsType.getLocal().equals(OsType.LINUX)) {

2
get-xpipe.ps1
View file

@ -100,7 +100,7 @@ function Uninstall {
param() param()
# Quick heuristic to see whether is can be possibly installed # Quick heuristic to see whether is can be possibly installed
if (-not (Test-Path "$env:LOCALAPPDATA\$ProductName" -PathType Container)) { if (-not ((Test-Path "$env:LOCALAPPDATA\$ProductName" -PathType Container) -or (Test-Path "$env:ProgramFiles\$ProductName" -PathType Container))) {
return return
} }