fix(bundler): update create-dmg, fixes #1571 (#1729)

lucasfernog · web-flow · commit f1aa12075f9f · 2021-05-06T12:57:08.000-03:00
diff --git a/.changes/config.json b/.changes/config.json
@@ -8,7 +8,7 @@
       "getPublishedVersion": "cargo search ${ pkgFile.pkg.package.name } --limit 1 | sed -nE \"s/^[^\\\"]*\\\"//; s/\\\".*//1p\"",
       "prepublish": [
         "sudo apt-get update",
-        "sudo apt-get install -y webkit2gtk-4.0",
+        "sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0",
         "cargo install cargo-audit --features=fix",
         {
           "command": "cargo generate-lockfile",
diff --git a/.changes/dmg-bundle-fixes.md b/.changes/dmg-bundle-fixes.md
@@ -0,0 +1,5 @@
+---
+"tauri-bundler": patch
+---
+
+Pull latest changes from `create-dmg`, fixing unmount issue.
diff --git a/.github/workflows/artifacts-updater.yml b/.github/workflows/artifacts-updater.yml
@@ -35,7 +35,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
         
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
diff --git a/.github/workflows/build-smoke-tests.yml b/.github/workflows/build-smoke-tests.yml
@@ -69,7 +69,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - name: yarn install for cli
         working-directory: tauri/tooling/cli.js
         run: yarn
diff --git a/.github/workflows/core-lint-fmt.yml b/.github/workflows/core-lint-fmt.yml
@@ -24,7 +24,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
       - uses: actions-rs/toolchain@v1
         with:
@@ -151,7 +151,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
       - uses: actions-rs/toolchain@v1
         with:
diff --git a/.github/workflows/covector-version-or-publish.yml b/.github/workflows/covector-version-or-publish.yml
@@ -70,7 +70,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - name: generate rust docs
         working-directory: ./tauri/core/tauri
         run: cargo doc --no-deps
diff --git a/.github/workflows/smoke-test-prod.yml b/.github/workflows/smoke-test-prod.yml
@@ -37,7 +37,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - name: cache rust bin
         id: cache_rust_bin
         uses: actions/cache@v1
diff --git a/.github/workflows/test-bundler.yml b/.github/workflows/test-bundler.yml
@@ -35,7 +35,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
@@ -100,7 +100,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - name: clippy check
         uses: actions-rs/clippy-check@v1
         with:
diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml
@@ -37,7 +37,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
@@ -161,7 +161,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
       - name: Get current date
         run: echo "CURRENT_DATE=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
diff --git a/.github/workflows/test-cta.yml b/.github/workflows/test-cta.yml
@@ -47,7 +47,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - run: yarn
         working-directory: tooling/create-tauri-app
       - run: yarn build
@@ -83,7 +83,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - run: yarn
         working-directory: tooling/create-tauri-app
       - run: yarn build
diff --git a/.github/workflows/udeps.yml b/.github/workflows/udeps.yml
@@ -90,7 +90,7 @@ jobs:
     - name: Install required packages
       run: |
         sudo apt-get update
-        sudo apt-get install -y webkit2gtk-4.0
+        sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
 
     - uses: actions-rs/cargo@v1
       with:
diff --git a/.github/workflows/update-docs.yml b/.github/workflows/update-docs.yml
@@ -32,7 +32,7 @@ jobs:
       - name: install webkit2gtk
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.0
+          sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0
       - name: generate rust docs
         working-directory: ./tauri/core/tauri
         run: cargo doc --no-deps
diff --git a/tooling/bundler/src/bundle/common.rs b/tooling/bundler/src/bundle/common.rs
@@ -6,7 +6,7 @@ use crate::Settings;
 use std::{
   ffi::OsStr,
   fs::{self, File},
-  io::{self, BufRead, BufReader, BufWriter, Write},
+  io::{self, BufWriter, Write},
   path::{Component, Path, PathBuf},
   process::{Command, Stdio},
 };
@@ -214,25 +214,16 @@ pub fn print_info(message: &str) -> crate::Result<()> {
 
 pub fn execute_with_verbosity(cmd: &mut Command, settings: &Settings) -> crate::Result<()> {
   let stdio_config = if settings.is_verbose() {
-    Stdio::piped
+    Stdio::inherit
   } else {
     Stdio::null
   };
-  let mut child = cmd
+  let status = cmd
     .stdout(stdio_config())
     .stderr(stdio_config())
-    .spawn()
+    .status()
     .expect("failed to spawn command");
-  if settings.is_verbose() {
-    let stdout = child.stdout.as_mut().expect("Failed to get stdout handle");
-    let reader = BufReader::new(stdout);
 
-    for line in reader.lines() {
-      println!("{}", line.expect("Failed to get line"));
-    }
-  }
-
-  let status = child.wait()?;
   if status.success() {
     Ok(())
   } else {
diff --git a/tooling/bundler/src/bundle/macos/dmg.rs b/tooling/bundler/src/bundle/macos/dmg.rs
@@ -41,7 +41,7 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
   let dmg_name = format!("{}.dmg", &package_base_name);
   let dmg_path = output_path.join(&dmg_name);
 
-  let product_name = &format!("{}.app", &package_base_name);
+  let product_name = &format!("{}.app", settings.main_binary_name());
   let bundle_dir = settings.project_out_directory().join("bundle/macos");
 
   let support_directory_path = output_path.join("support");
@@ -58,7 +58,6 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
 
   // create paths for script
   let bundle_script_path = output_path.join("bundle_dmg.sh");
-  let license_script_path = support_directory_path.join("dmg-license.py");
 
   common::print_bundling(format!("{:?}", &dmg_path).as_str())?;
 
@@ -72,15 +71,14 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
     include_str!("templates/dmg/template.applescript"),
   )?;
   write(
-    &license_script_path,
-    include_str!("templates/dmg/dmg-license.py"),
+    support_directory_path.join("eula-resources-template.xml"),
+    include_str!("templates/dmg/eula-resources-template.xml"),
   )?;
 
   // chmod script for execution
   Command::new("chmod")
     .arg("777")
     .arg(&bundle_script_path)
-    .arg(&license_script_path)
     .current_dir(output_path)
     .stdout(Stdio::piped())
     .stderr(Stdio::piped())
@@ -109,9 +107,15 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
     &product_name,
   ];
 
+  #[allow(unused_assignments)]
+  let mut license_path_ref = "".to_string();
   if let Some(license_path) = &settings.macos().license {
     args.push("--eula");
-    args.push(license_path);
+    license_path_ref = env::current_dir()?
+      .join(license_path)
+      .to_string_lossy()
+      .to_string();
+    args.push(&license_path_ref);
   }
 
   // Issue #592 - Building MacOS dmg files on CI
diff --git a/tooling/bundler/src/bundle/macos/templates/dmg/bundle_dmg b/tooling/bundler/src/bundle/macos/templates/dmg/bundle_dmg
diff --git a/tooling/bundler/src/bundle/macos/templates/dmg/dmg-license.py b/tooling/bundler/src/bundle/macos/templates/dmg/dmg-license.py
diff --git a/tooling/bundler/src/bundle/macos/templates/dmg/eula-resources-template.xml b/tooling/bundler/src/bundle/macos/templates/dmg/eula-resources-template.xml

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`"getPublishedVersion": "cargo search ${ pkgFile.pkg.package.name } --limit 1 \| sed -nE \"s/^[^\\\"]\\\"//; s/\\\".//1p\"",`
`9`	`9`	`"prepublish": [`
`10`	`10`	`"sudo apt-get update",`
`11`		`- "sudo apt-get install -y webkit2gtk-4.0",`
	`11`	`+ "sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0",`
`12`	`12`	`"cargo install cargo-audit --features=fix",`
`13`	`13`	`{`
`14`	`14`	`"command": "cargo generate-lockfile",`
-Original file line number
+Diff line change
@@ @@ -0,0 +1,5 @@ @@
 +---
 +"tauri-bundler": patch
 +---
++
 +Pull latest changes from `create-dmg`, fixing unmount issue.