.github/workflows/build-release.yml

@@ -8,8 +8,6 @@ jobs:
   build-release-windows:
     name: Build on Windows ${{ github.event.release.tag_name }}
     runs-on: windows-latest
-    permissions:
-      contents: write
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/cargo@v1
@@ -31,8 +29,6 @@ jobs:
   build-release-linux:
     name: Build on Linux ${{ github.event.release.tag_name }}
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
     steps:
       - uses: actions/checkout@v2
       - uses: actions-rs/cargo@v1

src/main.rs

@@ -250,7 +250,7 @@ async fn main() {
     if !current_exe_path.starts_with(&current_version_directory) {
         // Check if the latest bootstrapper is downloaded
         if !latest_bootstrapper_path.exists() {
-            info("Downloading the latest bootstrapper");
+            info("Downloading the latest bootstrapper and restarting");
             // Download the latest bootstrapper
             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()));
 
         if latest_bootstrapper_hash != current_exe_hash {
-            info("Starting latest bootstrapper");
             // Run the latest bootstrapper ( with the same arguments passed to us ) and exit
             #[cfg(target_os = "windows")]
             {
@@ -289,20 +288,10 @@ async fn main() {
                 // Make sure the latest bootstrapper is executable
                 std::process::Command::new("chmod").arg("+x").arg(latest_bootstrapper_path.to_str().unwrap()).spawn().unwrap();
 
-                let desktop_file_content = &format!("[Desktop Entry]
-Name=Syntax Launcher
-Exec={} %u
-Icon={}
-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));
+                info("We need permission to run the latest bootstrapper");
+                let mut command = std::process::Command::new(latest_bootstrapper_path);
+                command.args(&args[1..]);
+                command.spawn().unwrap();
             }
             std::process::exit(0);
 
@@ -381,16 +370,19 @@ MimeType=x-scheme-handler/syntax-player;", latest_bootstrapper_path.to_str().unw
         {
             // Linux support
             let desktop_file_content = &format!("[Desktop Entry]
-Name=Syntax Launcher
+Name=Syntax Player
 Exec={} %u
-Icon={}
 Type=Application
-Terminal=true
+Terminal=false
 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");
-            std::fs::write(desktop_file_path, desktop_file_content).unwrap();
+            let desktop_file_path = "/usr/share/applications/syntax-player.desktop";
+
+            let mut file = File::create(desktop_file_path).expect("Unable to create desktop file");
+            file.write_all(desktop_file_content.as_bytes())
+                .expect("Unable to write to desktop file");
+                    
         }
 
         // Write the AppSettings.xml file