lee/xpipe
1
0
Fork 0
mirror of https://github.com/xpipe-io/xpipe.git synced 2026-05-03 11:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix broken choco updater

Browse Source
This commit is contained in:
crschnick
2026-03-27 18:13:23 +00:00
parent 11ddf213e7
commit d4a6818d04
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/xpipe/app/core/AppRestart.java
+3 -3
View File
@@ -28,15 +28,15 @@ public class AppRestart {
var exec = loc.getCliExecutablePath();
return "\"" + exec + "\" open" + suffix;
} else {
var exe = loc.getDaemonDebugScriptPath();
var exe = loc.getDaemonExecutablePath();
if (ShellDialects.isPowershell(dialect)) {
var escapedList =
arguments.stream().map(s -> s.replaceAll("\"", "`\"")).toList();
var argumentList = String.join(" ", escapedList);
return "Start-Process -FilePath \"" + exe + "\" -ArgumentList \"" + argumentList + "\"";
return "echo \"Starting XPipe ...\"; Start-Process -FilePath \"" + exe + "\" -ArgumentList \"" + argumentList + "\"";
} else {
var base = "\"" + exe + "\"" + suffix;
return "start \"\" " + base;
return "echo Starting XPipe ...&start \"\" " + base;
}
}
}
app/src/main/java/io/xpipe/app/update/ChocoUpdater.java
+7 -7
View File
@@ -7,10 +7,7 @@ import io.xpipe.app.core.AppProperties;
import io.xpipe.app.core.AppRestart;
import io.xpipe.app.core.mode.AppOperationMode;
import io.xpipe.app.issue.ErrorEventFactory;
import io.xpipe.app.process.CommandBuilder;
import io.xpipe.app.process.LocalShell;
import io.xpipe.app.process.ShellDialects;
import io.xpipe.app.process.ShellScript;
import io.xpipe.app.process.*;
import io.xpipe.app.terminal.TerminalLaunch;
import io.xpipe.app.util.Hyperlinks;
@@ -74,8 +71,11 @@ public class ChocoUpdater extends UpdateHandler {
var powershellCommand = powershell
? "powershell -Command " + sc.getShellDialect().quoteArgument(commandToRun)
: "powershell -Command " + commandToRun;
return ShellScript.lines(powershellCommand, AppRestart.getTerminalRestartCommand());
});
return ShellScript.lines(
ShellDialects.isPowershell(sc) ? "echo \"Running choco command ...\"" : "echo Running choco command ...",
powershellCommand,
AppRestart.getTerminalRestartCommand());
}).launch();
});
} catch (Throwable t) {
ErrorEventFactory.fromThrowable(t).handle();
@@ -89,7 +89,7 @@ public class ChocoUpdater extends UpdateHandler {
var chocoRelease = getOutdatedPackageUpdateVersion();
// Use current release if the update is not available for choco yet
if (chocoRelease.isEmpty() || !chocoRelease.get().equals(rel.getTag())) {
if (chocoRelease.isEmpty() || (!chocoRelease.get().equals(rel.getTag()) && !chocoRelease.get().equals(rel.getTag() + ".0"))) {
rel = AppRelease.of(AppProperties.get().getVersion());
}