beenull/xpipe-mirror
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2024-09-19 22:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rework windows updater

Browse source
This commit is contained in:
crschnick 2024-02-28 14:13:30 +00:00
parent fb8e990083
commit 5ef3e1d508
1 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -8,6 +8,7 @@ import io.xpipe.app.util.LocalShell;
import io.xpipe.app.util.ScriptHelper;
import io.xpipe.app.util.TerminalLauncher;
import io.xpipe.core.process.OsType;
import io.xpipe.core.process.ShellDialects;
import io.xpipe.core.store.FileNames;
import io.xpipe.core.store.LocalStore;
import io.xpipe.core.util.XPipeInstallation;
@ -65,26 +66,46 @@ public class AppInstaller {
@Override
public void installLocal(String file) throws Exception {
var shellProcessControl = new LocalStore().control().start();
var exec = XPipeInstallation.getCurrentInstallationBasePath()
.resolve(XPipeInstallation.getDaemonExecutablePath(OsType.getLocal()));
var exec = (AppProperties.get().isDevelopmentEnvironment() ? Path.of(XPipeInstallation.getLocalDefaultInstallationBasePath()) :
XPipeInstallation.getCurrentInstallationBasePath())
.resolve(XPipeInstallation.getDaemonExecutablePath(OsType.getLocal())).toString();
var logsDir = FileNames.join(XPipeInstallation.getDataDir().toString(), "logs");
var logFile = FileNames.join(logsDir, "installer_" + FileNames.getFileName(file) + ".log");
var script = ScriptHelper.createExecScript(
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, file, logFile, file, logFile, exec, exec));
LocalShell.getShell().getShellDialect().equals(ShellDialects.CMD) ?
getCmdCommand(file, logFile, exec) : getPowershellCommand(file, logFile, exec));
TerminalLauncher.openDirect("XPipe Updater", LocalShell.getShell(), script);
}
private String getCmdCommand(String file, String logFile, String exec) {
return 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, file, logFile, file, logFile, exec, exec);
}
private String getPowershellCommand(String file, String logFile, String exec) {
return String.format(
"""
echo Installing %s ...
cd "$env:HOMEDRIVE\\$env:HOMEPATH"
echo '+ msiexec /i "%s" /lv "%s" /qr'
Start-Process msiexec -Wait -ArgumentList "/i", "`"%s`"", "/lv", "`"%s`"", "/qr"
echo 'Starting XPipe ...'
echo '+ "%s"'
Start-Process -FilePath "%s"
""",
file, file, logFile, file, logFile, exec, exec);
}
@Override
public String getExtension() {
return ".msi";