From ed266b48c1f8242bf285a18e505aa3f698efed4c Mon Sep 17 00:00:00 2001
From: nothingismagick <denjell@sfosc.org>
Date: Mon, 30 Dec 2019 12:04:12 +0100
Subject: [PATCH] chore(templates): remove updater.rs, add build.rs (#251)

---
 .github/config.yml                            |  0
 .../templates/{src-tauri/src => }/updater.rs  |  0
 .../create-react-app/src-tauri/src/build.rs   | 12 ++++
 .../create-react-app/src-tauri/src/updater.rs | 69 -------------------
 .../gatsby-themed-site/src-tauri/src/build.rs | 12 ++++
 examples/react/next.js/src-tauri/src/build.rs | 12 ++++
 .../react/next.js/src-tauri/src/updater.rs    | 69 -------------------
 .../svelte/svelte-app/src-tauri/src/build.rs  | 12 ++++
 .../svelte-app/src-tauri/src/updater.rs       | 69 -------------------
 .../vanillajs/monolith/src-tauri/src/build.rs | 12 ++++
 .../vue/quasar-app/src-tauri/src/build.rs     | 12 ++++
 .../vue/quasar-app/src-tauri/src/updater.rs   | 69 -------------------
 12 files changed, 72 insertions(+), 276 deletions(-)
 create mode 100644 .github/config.yml
 rename cli/tauri.js/templates/{src-tauri/src => }/updater.rs (100%)
 create mode 100644 examples/react/create-react-app/src-tauri/src/build.rs
 delete mode 100644 examples/react/create-react-app/src-tauri/src/updater.rs
 create mode 100644 examples/react/gatsby-themed-site/src-tauri/src/build.rs
 create mode 100644 examples/react/next.js/src-tauri/src/build.rs
 delete mode 100644 examples/react/next.js/src-tauri/src/updater.rs
 create mode 100644 examples/svelte/svelte-app/src-tauri/src/build.rs
 delete mode 100644 examples/svelte/svelte-app/src-tauri/src/updater.rs
 create mode 100644 examples/vanillajs/monolith/src-tauri/src/build.rs
 create mode 100644 examples/vue/quasar-app/src-tauri/src/build.rs
 delete mode 100644 examples/vue/quasar-app/src-tauri/src/updater.rs

diff --git a/.github/config.yml b/.github/config.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/cli/tauri.js/templates/src-tauri/src/updater.rs b/cli/tauri.js/templates/updater.rs
similarity index 100%
rename from cli/tauri.js/templates/src-tauri/src/updater.rs
rename to cli/tauri.js/templates/updater.rs
diff --git a/examples/react/create-react-app/src-tauri/src/build.rs b/examples/react/create-react-app/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/react/create-react-app/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/react/create-react-app/src-tauri/src/updater.rs b/examples/react/create-react-app/src-tauri/src/updater.rs
deleted file mode 100644
index a2eae3d84..000000000
--- a/examples/react/create-react-app/src-tauri/src/updater.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::tauri::process::{ProcessExt, Signal, SystemExt};
-
-fn update() -> Result<(), String> {
-  let target = tauri::platform::target_triple().map_err(|_| "Could not determine target")?;
-  let github_release = tauri::updater::github::get_latest_release("jaemk", "self_update")
-    .map_err(|_| "Could not fetch latest release")?;
-  match github_release.asset_for(&target) {
-    Some(github_release_asset) => {
-      let release = tauri::updater::Release {
-        version: github_release.tag.trim_start_matches('v').to_string(),
-        download_url: github_release_asset.download_url,
-        asset_name: github_release_asset.name,
-      };
-
-      let status = tauri::updater::Update::configure()
-        .unwrap()
-        .release(release)
-        .bin_path_in_archive("github")
-        .bin_name("app")
-        .bin_install_path(&tauri::command::command_path("app".to_string()).unwrap())
-        .show_download_progress(true)
-        .current_version(env!("CARGO_PKG_VERSION"))
-        .build()
-        .unwrap()
-        .update()
-        .unwrap();
-
-      println!("found release: {}", status.version());
-
-      /*let tmp_dir = tauri::dir::with_temp_dir(|dir| {
-          let file_path = dir.path().join("my-temporary-note.pdf");
-          let mut tmp_archive = std::fs::File::create(file_path).unwrap();
-          tauri::http::download(&"https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf".to_string(), &mut tmp_archive, true).unwrap();
-      });*/
-
-      Ok(())
-    }
-    None => Err(format!("Could not find release for target {}", target)),
-  }
-}
-
-fn restart_app(app_command: String) -> Result<(), String> {
-  let mut system = tauri::process::System::new();
-  let parent_process = tauri::process::get_parent_process(&mut system)
-    .map_err(|_| "Could not determine parent process")?;
-  if parent_process.name() == "app" {
-    parent_process.kill(Signal::Kill);
-    std::thread::sleep(std::time::Duration::from_secs(1));
-    std::process::Command::new(app_command)
-      .spawn()
-      .map_err(|_| "Could not start app")?;
-  }
-  Ok(())
-}
-
-fn run_updater() -> Result<(), String> {
-  let app_command = tauri::command::relative_command("app".to_string())
-    .map_err(|_| "Could not determine app path")?;
-  update()?;
-  restart_app(app_command)?;
-  Ok(())
-}
-
-fn main() {
-  match run_updater() {
-    Ok(_) => {}
-    Err(err) => panic!(err),
-  };
-}
diff --git a/examples/react/gatsby-themed-site/src-tauri/src/build.rs b/examples/react/gatsby-themed-site/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/react/gatsby-themed-site/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/react/next.js/src-tauri/src/build.rs b/examples/react/next.js/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/react/next.js/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/react/next.js/src-tauri/src/updater.rs b/examples/react/next.js/src-tauri/src/updater.rs
deleted file mode 100644
index a2eae3d84..000000000
--- a/examples/react/next.js/src-tauri/src/updater.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::tauri::process::{ProcessExt, Signal, SystemExt};
-
-fn update() -> Result<(), String> {
-  let target = tauri::platform::target_triple().map_err(|_| "Could not determine target")?;
-  let github_release = tauri::updater::github::get_latest_release("jaemk", "self_update")
-    .map_err(|_| "Could not fetch latest release")?;
-  match github_release.asset_for(&target) {
-    Some(github_release_asset) => {
-      let release = tauri::updater::Release {
-        version: github_release.tag.trim_start_matches('v').to_string(),
-        download_url: github_release_asset.download_url,
-        asset_name: github_release_asset.name,
-      };
-
-      let status = tauri::updater::Update::configure()
-        .unwrap()
-        .release(release)
-        .bin_path_in_archive("github")
-        .bin_name("app")
-        .bin_install_path(&tauri::command::command_path("app".to_string()).unwrap())
-        .show_download_progress(true)
-        .current_version(env!("CARGO_PKG_VERSION"))
-        .build()
-        .unwrap()
-        .update()
-        .unwrap();
-
-      println!("found release: {}", status.version());
-
-      /*let tmp_dir = tauri::dir::with_temp_dir(|dir| {
-          let file_path = dir.path().join("my-temporary-note.pdf");
-          let mut tmp_archive = std::fs::File::create(file_path).unwrap();
-          tauri::http::download(&"https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf".to_string(), &mut tmp_archive, true).unwrap();
-      });*/
-
-      Ok(())
-    }
-    None => Err(format!("Could not find release for target {}", target)),
-  }
-}
-
-fn restart_app(app_command: String) -> Result<(), String> {
-  let mut system = tauri::process::System::new();
-  let parent_process = tauri::process::get_parent_process(&mut system)
-    .map_err(|_| "Could not determine parent process")?;
-  if parent_process.name() == "app" {
-    parent_process.kill(Signal::Kill);
-    std::thread::sleep(std::time::Duration::from_secs(1));
-    std::process::Command::new(app_command)
-      .spawn()
-      .map_err(|_| "Could not start app")?;
-  }
-  Ok(())
-}
-
-fn run_updater() -> Result<(), String> {
-  let app_command = tauri::command::relative_command("app".to_string())
-    .map_err(|_| "Could not determine app path")?;
-  update()?;
-  restart_app(app_command)?;
-  Ok(())
-}
-
-fn main() {
-  match run_updater() {
-    Ok(_) => {}
-    Err(err) => panic!(err),
-  };
-}
diff --git a/examples/svelte/svelte-app/src-tauri/src/build.rs b/examples/svelte/svelte-app/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/svelte/svelte-app/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/svelte/svelte-app/src-tauri/src/updater.rs b/examples/svelte/svelte-app/src-tauri/src/updater.rs
deleted file mode 100644
index a2eae3d84..000000000
--- a/examples/svelte/svelte-app/src-tauri/src/updater.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::tauri::process::{ProcessExt, Signal, SystemExt};
-
-fn update() -> Result<(), String> {
-  let target = tauri::platform::target_triple().map_err(|_| "Could not determine target")?;
-  let github_release = tauri::updater::github::get_latest_release("jaemk", "self_update")
-    .map_err(|_| "Could not fetch latest release")?;
-  match github_release.asset_for(&target) {
-    Some(github_release_asset) => {
-      let release = tauri::updater::Release {
-        version: github_release.tag.trim_start_matches('v').to_string(),
-        download_url: github_release_asset.download_url,
-        asset_name: github_release_asset.name,
-      };
-
-      let status = tauri::updater::Update::configure()
-        .unwrap()
-        .release(release)
-        .bin_path_in_archive("github")
-        .bin_name("app")
-        .bin_install_path(&tauri::command::command_path("app".to_string()).unwrap())
-        .show_download_progress(true)
-        .current_version(env!("CARGO_PKG_VERSION"))
-        .build()
-        .unwrap()
-        .update()
-        .unwrap();
-
-      println!("found release: {}", status.version());
-
-      /*let tmp_dir = tauri::dir::with_temp_dir(|dir| {
-          let file_path = dir.path().join("my-temporary-note.pdf");
-          let mut tmp_archive = std::fs::File::create(file_path).unwrap();
-          tauri::http::download(&"https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf".to_string(), &mut tmp_archive, true).unwrap();
-      });*/
-
-      Ok(())
-    }
-    None => Err(format!("Could not find release for target {}", target)),
-  }
-}
-
-fn restart_app(app_command: String) -> Result<(), String> {
-  let mut system = tauri::process::System::new();
-  let parent_process = tauri::process::get_parent_process(&mut system)
-    .map_err(|_| "Could not determine parent process")?;
-  if parent_process.name() == "app" {
-    parent_process.kill(Signal::Kill);
-    std::thread::sleep(std::time::Duration::from_secs(1));
-    std::process::Command::new(app_command)
-      .spawn()
-      .map_err(|_| "Could not start app")?;
-  }
-  Ok(())
-}
-
-fn run_updater() -> Result<(), String> {
-  let app_command = tauri::command::relative_command("app".to_string())
-    .map_err(|_| "Could not determine app path")?;
-  update()?;
-  restart_app(app_command)?;
-  Ok(())
-}
-
-fn main() {
-  match run_updater() {
-    Ok(_) => {}
-    Err(err) => panic!(err),
-  };
-}
diff --git a/examples/vanillajs/monolith/src-tauri/src/build.rs b/examples/vanillajs/monolith/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/vanillajs/monolith/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/vue/quasar-app/src-tauri/src/build.rs b/examples/vue/quasar-app/src-tauri/src/build.rs
new file mode 100644
index 000000000..fcd568038
--- /dev/null
+++ b/examples/vue/quasar-app/src-tauri/src/build.rs
@@ -0,0 +1,12 @@
+#[cfg(windows)]
+extern crate winres;
+
+#[cfg(windows)]
+fn main() {
+  let mut res = winres::WindowsResource::new();
+  res.set_icon("icons/icon.ico");
+  res.compile().expect("Unable to find visual studio tools");
+}
+
+#[cfg(not(windows))]
+fn main() {}
diff --git a/examples/vue/quasar-app/src-tauri/src/updater.rs b/examples/vue/quasar-app/src-tauri/src/updater.rs
deleted file mode 100644
index a2eae3d84..000000000
--- a/examples/vue/quasar-app/src-tauri/src/updater.rs
+++ /dev/null
@@ -1,69 +0,0 @@
-use crate::tauri::process::{ProcessExt, Signal, SystemExt};
-
-fn update() -> Result<(), String> {
-  let target = tauri::platform::target_triple().map_err(|_| "Could not determine target")?;
-  let github_release = tauri::updater::github::get_latest_release("jaemk", "self_update")
-    .map_err(|_| "Could not fetch latest release")?;
-  match github_release.asset_for(&target) {
-    Some(github_release_asset) => {
-      let release = tauri::updater::Release {
-        version: github_release.tag.trim_start_matches('v').to_string(),
-        download_url: github_release_asset.download_url,
-        asset_name: github_release_asset.name,
-      };
-
-      let status = tauri::updater::Update::configure()
-        .unwrap()
-        .release(release)
-        .bin_path_in_archive("github")
-        .bin_name("app")
-        .bin_install_path(&tauri::command::command_path("app".to_string()).unwrap())
-        .show_download_progress(true)
-        .current_version(env!("CARGO_PKG_VERSION"))
-        .build()
-        .unwrap()
-        .update()
-        .unwrap();
-
-      println!("found release: {}", status.version());
-
-      /*let tmp_dir = tauri::dir::with_temp_dir(|dir| {
-          let file_path = dir.path().join("my-temporary-note.pdf");
-          let mut tmp_archive = std::fs::File::create(file_path).unwrap();
-          tauri::http::download(&"https://www.w3.org/WAI/ER/tests/xhtml/testfiles/resources/pdf/dummy.pdf".to_string(), &mut tmp_archive, true).unwrap();
-      });*/
-
-      Ok(())
-    }
-    None => Err(format!("Could not find release for target {}", target)),
-  }
-}
-
-fn restart_app(app_command: String) -> Result<(), String> {
-  let mut system = tauri::process::System::new();
-  let parent_process = tauri::process::get_parent_process(&mut system)
-    .map_err(|_| "Could not determine parent process")?;
-  if parent_process.name() == "app" {
-    parent_process.kill(Signal::Kill);
-    std::thread::sleep(std::time::Duration::from_secs(1));
-    std::process::Command::new(app_command)
-      .spawn()
-      .map_err(|_| "Could not start app")?;
-  }
-  Ok(())
-}
-
-fn run_updater() -> Result<(), String> {
-  let app_command = tauri::command::relative_command("app".to_string())
-    .map_err(|_| "Could not determine app path")?;
-  update()?;
-  restart_app(app_command)?;
-  Ok(())
-}
-
-fn main() {
-  match run_updater() {
-    Ok(_) => {}
-    Err(err) => panic!(err),
-  };
-}