yuzu/liftinstall
1
0
Fork 0
mirror of https://github.com/yuzu-emu/liftinstall.git synced 2024-09-20 00:55:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-incorrect-self-update

Browse source
This commit is contained in:
James 2018-10-04 14:08:39 +10:00
parent 6b801a451e 65493fd7c4
commit 221ce6c072
1 changed files with 42 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/main.rs
View file

@ -141,14 +141,29 @@ fn main() {
to_path.display() to_path.display()
); );
if cfg!(windows) { // Attempt it a few times because Windows can hold a lock
use std::fs::copy; for i in 1..=5 {
let swap_result = if cfg!(windows) {
use std::fs::copy;
copy(&current_exe, &to_path).log_expect("Unable to copy new installer"); copy(&current_exe, &to_path).map(|_x| ())
} else { } else {
use std::fs::rename; use std::fs::rename;
rename(&current_exe, &to_path).log_expect("Unable to move new installer"); rename(&current_exe, &to_path)
};
match swap_result {
Ok(_) => break,
Err(e) => {
if i < 5 {
info!("Copy attempt failed: {:?}, retrying in 3 seconds.", e);
thread::sleep(time::Duration::from_millis(3000));
} else {
let _: () = Err(e).log_expect("Copying new binary failed");
}
}
}
} }
Command::new(to_path) Command::new(to_path)
@ -158,6 +173,7 @@ fn main() {
exit(0); exit(0);
} }
// If we just finished a update, we need to inject our previous command line arguments
let args_file = current_path.join("args.json"); let args_file = current_path.join("args.json");
if args_file.exists() { if args_file.exists() {
@ -170,18 +186,32 @@ fn main() {
matches = reinterpret_app.get_matches_from(database); matches = reinterpret_app.get_matches_from(database);
info!("Reparsed command line arguments from original instance"); info!("Parsed command line arguments from original instance");
remove_file(args_file).log_expect("Unable to clean up args file"); remove_file(args_file).log_expect("Unable to clean up args file");
}
if cfg!(windows) { // Cleanup any remaining new maintenance tool instances if they exist
let updater_executable = current_path.join("maintenancetool.exe"); if cfg!(windows) {
let updater_executable = current_path.join("maintenancetool_new.exe");
if updater_executable.exists() {
// Sleep a little bit to allow Windows to close the previous file handle // Sleep a little bit to allow Windows to close the previous file handle
thread::sleep(time::Duration::from_millis(3000)); thread::sleep(time::Duration::from_millis(3000));
if updater_executable.exists() { // Attempt it a few times because Windows can hold a lock
remove_file(updater_executable) for i in 1..=5 {
.log_expect("Unable to clean up previous updater file"); let swap_result = remove_file(&updater_executable);
match swap_result {
Ok(_) => break,
Err(e) => {
if i < 5 {
info!("Cleanup attempt failed: {:?}, retrying in 3 seconds.", e);
thread::sleep(time::Duration::from_millis(3000));
} else {
warn!("Deleting temp binary failed after 5 attempts: {:?}", e);
}
}
}
} }
} }
} }