Syntax
/
syntax-bootstrapper
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 8 Wiki Activity

Compare commits

base: Syntax:main
Branches Tags
Syntax:main
Syntax:Release-1-3-4-3
Syntax:Release-1-3-4-2
Syntax:Release-1-3-4-1
Syntax:Release-1-3-4
Syntax:Release-1-3-2
Syntax:Release-1-3-0
Syntax:Release-1-2-0
Syntax:Release
..
compare: Syntax:Release-1-3-4-1
Branches Tags
Syntax:main
Syntax:Release-1-3-4-3
Syntax:Release-1-3-4-2
Syntax:Release-1-3-4-1
Syntax:Release-1-3-4
Syntax:Release-1-3-2
Syntax:Release-1-3-0
Syntax:Release-1-2-0
Syntax:Release

No commits in common. "main" and "Release-1-3-4-1" have entirely different histories.
main ... Release-1-

1 changed files with 10 additions and 21 deletions
Show Stats Expand all files Collapse all files

31
src/main.rs
View File

@ -250,7 +250,7 @@ async fn main() {
if !current_exe_path.starts_with(&current_version_directory) { if !current_exe_path.starts_with(&current_version_directory) {
// Check if the latest bootstrapper is downloaded // Check if the latest bootstrapper is downloaded
if !latest_bootstrapper_path.exists() { if !latest_bootstrapper_path.exists() {
info("Downloading the latest bootstrapper"); info("Downloading the latest bootstrapper and restarting");
// Download the latest bootstrapper // Download the latest bootstrapper
download_file(&http_client, &format!("https://{}/{}-{}", setup_url, latest_client_version, bootstrapper_filename), &latest_bootstrapper_path).await; download_file(&http_client, &format!("https://{}/{}-{}", setup_url, latest_client_version, bootstrapper_filename), &latest_bootstrapper_path).await;
} }
@ -266,7 +266,6 @@ async fn main() {
debug(&format!("Current Bootstrapper Hash: {}", current_exe_hash.bright_blue())); debug(&format!("Current Bootstrapper Hash: {}", current_exe_hash.bright_blue()));
if latest_bootstrapper_hash != current_exe_hash { if latest_bootstrapper_hash != current_exe_hash {
info("Starting latest bootstrapper");
// Run the latest bootstrapper ( with the same arguments passed to us ) and exit // Run the latest bootstrapper ( with the same arguments passed to us ) and exit
#[cfg(target_os = "windows")] #[cfg(target_os = "windows")]
{ {
@ -289,20 +288,10 @@ async fn main() {
// Make sure the latest bootstrapper is executable // Make sure the latest bootstrapper is executable
std::process::Command::new("chmod").arg("+x").arg(latest_bootstrapper_path.to_str().unwrap()).spawn().unwrap(); std::process::Command::new("chmod").arg("+x").arg(latest_bootstrapper_path.to_str().unwrap()).spawn().unwrap();
let desktop_file_content = &format!("[Desktop Entry] info("We need permission to run the latest bootstrapper");
Name=Syntax Launcher let mut command = std::process::Command::new(latest_bootstrapper_path);
Exec={} %u command.args(&args[1..]);
Icon={} command.spawn().unwrap();
Type=Application
Terminal=true
Version={}
MimeType=x-scheme-handler/syntax-player;", latest_bootstrapper_path.to_str().unwrap(), latest_bootstrapper_path.to_str().unwrap(), env!("CARGO_PKG_VERSION"));
let desktop_file_path = dirs::data_local_dir().unwrap().join("applications").join("syntax-player.desktop");
std::fs::write(desktop_file_path, desktop_file_content).unwrap();
info("Please launch SYNTAX from the website, to continue with the update process.");
std::thread::sleep(std::time::Duration::from_secs(20));
} }
std::process::exit(0); std::process::exit(0);
@ -381,15 +370,15 @@ MimeType=x-scheme-handler/syntax-player;", latest_bootstrapper_path.to_str().unw
{ {
// Linux support // Linux support
let desktop_file_content = &format!("[Desktop Entry] let desktop_file_content = &format!("[Desktop Entry]
Name=Syntax Launcher Name=Syntax Player
Exec={} %u Exec={} %u
Icon={}
Type=Application Type=Application
Terminal=true Terminal=false
Version={} Version={}
MimeType=x-scheme-handler/syntax-player;", latest_bootstrapper_path.to_str().unwrap(), latest_bootstrapper_path.to_str().unwrap(), env!("CARGO_PKG_VERSION")); MimeType=x-scheme-handler/syntax-player;", latest_bootstrapper_path.to_str().unwrap(), env!("CARGO_PKG_VERSION"));
let desktop_file_path = dirs::data_local_dir().unwrap().join("applications").join("syntax-player.desktop"); let desktop_file_path = "/usr/share/applications/syntax-player.desktop";
std::fs::write(desktop_file_path, desktop_file_content).unwrap(); std::fs::write(desktop_file_path, desktop_file_content).unwrap();
} }