0ct0pu5/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2025-04-16 17:23:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rework windows updater to fix issues

Browse source
This commit is contained in:
crschnick 2024-02-28 12:30:22 +00:00
parent b847a6fb9f
commit ac1fcf821d
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/io/xpipe/app/update/AppInstaller.java
View file

@ -73,12 +73,16 @@ public class AppInstaller {
shellProcessControl,
String.format(
"""
echo Installing %s ...
cd /D "%%HOMEDRIVE%%%%HOMEPATH%%"
echo + msiexec /i "%s" /lv "%s" /qr
start "" /wait msiexec /i "%s" /lv "%s" /qr
echo Starting XPipe ...
echo + "%s"
start "" "%s"
""",
file, logFile, exec));
shellProcessControl.executeSimpleCommand("start \"XPipe Updater\" /min cmd /c \"" + script + "\"");
file, file, logFile, file, logFile, exec, exec));
TerminalLauncher.openDirect("XPipe Updater", LocalShell.getShell(), script);
}
@Override

2
app/src/main/java/io/xpipe/app/update/UpdateChangelogAlert.java
View file

@ -9,6 +9,7 @@ import javafx.scene.control.Alert;
import javafx.scene.control.ButtonBar;
import javafx.scene.control.ButtonType;
import javafx.stage.Modality;
import javafx.stage.Stage;
public class UpdateChangelogAlert {
@ -48,6 +49,7 @@ public class UpdateChangelogAlert {
alert.getDialogPane().setContent(markdown);
alert.getButtonTypes().add(new ButtonType(AppI18n.get("gotIt"), ButtonBar.ButtonData.OK_DONE));
((Stage) alert.getDialogPane().getScene().getWindow()).setAlwaysOnTop(true);
},
r -> r.filter(b -> b.getButtonData().isDefaultButton()).ifPresent(t -> {}));
}