Mirrors/velopack
1
0
Fork 0
mirror of https://github.com/velopack/velopack.git synced 2025-10-25 15:19:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Restart app during apply by default, add --norestart argument.

Browse Source
This commit is contained in:
Caelan Sayler
2024-03-26 11:58:09 +00:00
parent 3de20f4bd6
commit 67dc3174cc
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Rust/src/update.rs
View File

@@ -16,7 +16,7 @@ fn root_command() -> Command {
.about(format!("Velopack Updater ({}) manages packages and installs updates.\nhttps://github.com/velopack/velopack", env!("NGBV_VERSION")))
.subcommand(Command::new("apply")
.about("Applies a staged / prepared update, installing prerequisite runtimes if necessary")
.arg(arg!(-r --restart "Restart the application after the update"))
.arg(arg!(--norestart "Do not restart the application after the update"))
.arg(arg!(-w --wait "Wait for the parent process to terminate before applying the update"))
.arg(arg!(--waitPid <PID> "Wait for the specified process to terminate before applying the update").value_parser(value_parser!(u32)))
.arg(arg!(-p --package <FILE> "Update package to apply").value_parser(value_parser!(PathBuf)))
@@ -35,6 +35,8 @@ fn root_command() -> Command {
.arg(arg!(--nocolor "Disable colored output").hide(true).global(true))
.arg(arg!(-s --silent "Don't show any prompts / dialogs").global(true))
.arg(arg!(-l --log <PATH> "Override the default log file location").global(true).value_parser(value_parser!(PathBuf)))
.arg(arg!(--forceLatest "Legacy argument").hide(true).global(true))
.arg(arg!(-r --restart "Legacy argument").hide(true).global(true))
.ignore_errors(true)
.disable_help_subcommand(true)
.flatten_help(true);
@@ -153,7 +155,7 @@ fn patch(matches: &ArgMatches) -> Result<()> {
}
fn apply(matches: &ArgMatches) -> Result<()> {
let restart = get_flag_or_false(&matches, "restart");
let restart = !get_flag_or_false(&matches, "norestart");
let package = matches.get_one::<PathBuf>("package");
let exe_args: Option<Vec<&str>> = matches.get_many::<String>("EXE_ARGS").map(|v| v.map(|f| f.as_str()).collect());
let wait = get_op_wait(&matches);

9
src/Velopack/UpdateExe.cs
View File

@@ -48,9 +48,6 @@ namespace Velopack
if (silent) args.Add("--silent");
args.Add("apply");
args.Add("--waitPid");
args.Add(Process.GetCurrentProcess().Id.ToString());
var entry = toApply ?? locator.GetLatestLocalFullPackage();
if (entry != null && locator.PackagesDir != null) {
var pkg = Path.Combine(locator.PackagesDir, entry.FileName);
@@ -60,7 +57,11 @@ namespace Velopack
}
}
if (restart) args.Add("--restart");
args.Add("--waitPid");
args.Add(Process.GetCurrentProcess().Id.ToString());
if (!restart) args.Add("--norestart"); // restarting is now the default Update.exe behavior
if (restart && restartArgs != null && restartArgs.Length > 0) {
args.Add("--");
foreach (var a in restartArgs) {