refactor: do not proxy dev server when using localhost on iOS/Android

.changes/android-external-files-fix.md

@@ -1,5 +0,0 @@
----
-"tauri": patch:bug
----
-
-Fixed 500 error when accessing local video files in Android external storage directory via `convertFileSrc`. Added better error handling and logging for Android external storage access to help diagnose permission and accessibility issues.

.changes/change-pr-13253.md

@@ -1,6 +0,0 @@
----
-"@tauri-apps/cli": patch:enhance
-"tauri-cli": patch:enhance
----
-
-Allow electron to run the CLI directly

.changes/change-pr-14632.md

@@ -1,7 +0,0 @@
----
-"tauri-utils": patch:enhance
-"tauri-build": patch:enhance
-"tauri-cli": patch:enhance
----
-
-Small code refactors for improved code readability. No user facing changes.

.changes/change-pr-14766.md

@@ -1,5 +0,0 @@
----
-"tauri-macos-sign": patch:deps
----
-
-Remove once-cell-regex from direct dependencies.

.changes/config.json

@@ -4,7 +4,7 @@
     "feat": "New Features",
     "enhance": "Enhancements",
     "bug": "Bug Fixes",
-    "perf": "Performance Improvements",
+    "pref": "Performance Improvements",
     "changes": "What's Changed",
     "sec": "Security fixes",
     "deps": "Dependencies",
@@ -27,6 +27,12 @@
           "dryRunCommand": true,
           "pipe": true
         },
+        {
+          "command": "cargo generate-lockfile",
+          "dryRunCommand": true,
+          "runFromRoot": true,
+          "pipe": true
+        },
         {
           "command": "cargo audit ${ process.env.CARGO_AUDIT_OPTIONS || '' }",
           "dryRunCommand": true,

.changes/empty-vec-instead-of-none.md

@@ -1,6 +0,0 @@
----
-"@tauri-apps/cli": patch:enhance
-"tauri-cli": patch:enhance
----
-
-Simplified internal representation of `features: Option<Vec<String>>` with `Vec<String>`, no user facing changes

.changes/fix-android-bundle-flag.md

@@ -1,6 +0,0 @@
----
-"tauri-cli": patch:bug
-"@tauri-apps/cli": patch:bug
----
-
-Fix `android build`'s `--aab` and `--apk` flags requiring a value to be provided.

.changes/fix-binary-patching.md

@@ -1,8 +0,0 @@
----
-"tauri": minor:changes
-"tauri-cli": minor:changes
-"tauri-bundler": minor:changes
-"@tauri-apps/cli": minor:changes
----
-
-Change the way bundle type information is added to binary files. Instead of looking up the value of a variable we simply look for the default value.

.changes/fix-empty-entitlements.md

@@ -1,6 +0,0 @@
----
-"tauri-cli": patch:bug
-"@tauri-apps/cli": patch:bug
----
-
-Fix empty associated-domains entitlements when domains are not configured for deep links.

.changes/fix-inspect-description.md

@@ -1,6 +0,0 @@
----
-"@tauri-apps/cli": patch:bug
-"tauri-cli": patch:bug
----
-
-Fixed the command description for `tauri inspect`

.changes/linux-webcontext.md

@@ -1,5 +0,0 @@
----
-tauri-runtime-wry: patch:bug
----
-
-On Linux, keep the WebContext alive to prevent zombie WebKit processes after repeatedly closing all windows and re-opening them.

.changes/msrv-1.77.2.md

@@ -0,0 +1,16 @@
+---
+"tauri": patch:changes
+"tauri-utils": patch:changes
+"tauri-runtime": patch:changes
+"tauri-runtime-wry": patch:changes
+"tauri-codegen": patch:changes
+"tauri-macros": patch:changes
+"tauri-plugin": patch:changes
+"tauri-build": patch:changes
+"tauri-cli": patch:changes
+"tauri-macos-sign": patch:changes
+"tauri-bundler": patch:changes
+"tauri-driver": patch:changes
+---
+
+Downgrade MSRV to 1.77.2 to support Windows.

.changes/only-watch-dependencies.md

@@ -1,6 +0,0 @@
----
-"@tauri-apps/cli": patch:bug
-"tauri-cli": patch:bug
----
-
-Only watch dependent workspace members when running `tauri dev` instead of watching on all members

.changes/reduce-internal-statics.md

@@ -1,6 +0,0 @@
----
-"@tauri-apps/cli": patch:changes
-"tauri-cli": patch:changes
----
-
-Refactored internal use of static on config and directory resolvings, no user facing changes, please report any regressions if you encounter any

.changes/runtime-bsd.md

@@ -1,6 +0,0 @@
----
-tauri-runtime: patch:bug
-tauri-runtime-wry: patch:bug
----
-
-Fix compilation errors when targeting BSD.

.changes/signing-env-vars.md

@@ -1,14 +0,0 @@
----
-"tauri-cli": patch:enhance
-"@tauri-apps/cli": patch:enhance
----
-
-Added new environment variables for `tauri signer sign` command, to align with existing environment variables used in `tauri build`, `tauri bundle` and `tauri signer generate`
-- `TAURI_SIGNING_PRIVATE_KEY`
-- `TAURI_SIGNING_PRIVATE_KEY_PATH`
-- `TAURI_SIGNING_PRIVATE_KEY_PASSWORD`
-
-The old environment variables are deprecated and will be removed in a future release.
-- `TAURI_PRIVATE_KEY`
-- `TAURI_PRIVATE_KEY_PATH`
-- `TAURI_PRIVATE_KEY_PASSWORD`

.changes/updater-signer-files-without-extension.md

@@ -1,6 +0,0 @@
----
-tauri-cli: patch:bug
-"@tauri-apps/cli": patch:bug
----
-
-`tauri signer sign` doesn't work for files without an extension

.changes/webkitgtk202.md

@@ -1,7 +0,0 @@
----
-tauri-runtime-wry: minor:deps
-tauri-runtime: minor:deps
-tauri: minor:deps
----
-
-**Breaking Change** for `with_webview` users: Updated webkit2gtk-rs crates to `v2.0.2`.

.changes/webview-set-simple-fullscreen.md

@@ -1,7 +0,0 @@
----
-'tauri': 'minor:feat'
----
-
-Add `set_simple_fullscreen` method to `WebviewWindow`.
-
-This method was already available on the `Window` type and is now also available on `WebviewWindow` for consistency. On macOS, it toggles fullscreen mode without creating a new macOS Space. On other platforms, it falls back to regular fullscreen.

.changes/window-config-focus-default-true.md

@@ -1,5 +0,0 @@
----
-tauri: patch:bug
----
-
-`WindowConfig::focus` is set to `false` in `WindowConfig::default()`

.changes/wry-054.md

@@ -1,6 +0,0 @@
----
-tauri-runtime-wry: patch:deps
-tauri: patch:deps
----
-
-Update wry to `v0.54`.

.github/CONTRIBUTING.md

@@ -33,9 +33,11 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 - It's OK to have multiple small commits as you work on the PR - we will let GitHub automatically squash it before merging.
 
 - If adding new feature:
+
   - Provide convincing reason to add this feature. Ideally you should open a suggestion issue first and have it greenlighted before working on it.
 
 - If fixing a bug:
+
   - If you are resolving a special issue, add `(fix: #xxxx[,#xxx])` (#xxxx is the issue id) in your PR title for a better release log, e.g. `fix: update entities encoding/decoding (fix #3899)`.
   - Provide detailed description of the bug in the PR, or link to an issue that does.
 
@@ -49,60 +51,37 @@ Hi! We, the maintainers, are really excited that you are interested in contribut
 
 First, [join our Discord server](https://discord.gg/SpmNs4S) and let us know that you want to contribute. This way we can point you in the right direction and help ensure your contribution will be as helpful as possible.
 
-To set up your machine for development, follow the [Tauri setup guide](https://v2.tauri.app/start/prerequisites/) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [PNPM](https://pnpm.io/), it is only required if you are developing the Node CLI or API packages (`packages/cli` and `packages/api`).
+To set up your machine for development, follow the [Tauri setup guide](https://v2.tauri.app/start/prerequisites/) to get all the tools you need to develop Tauri apps. The only additional tool you may need is [PNPM](https://pnpm.io/), it is only required if you are developing the Node CLI or API packages (`packages/cli` and `packages/api`). Next, fork and clone this repo. It is structured as a monorepo, which means that all the various Tauri packages are under the same repository. The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
 
-Next, [fork](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/fork-a-repo) and clone [this repository](https://github.com/tauri-apps).
-The development process varies depending on what part of Tauri you are contributing to, see the guides below for per-package instructions.
-
-Some Tauri packages will be automatically built when running one of the examples. Others, however, will need to be built beforehand. To initialize, execute these commands in the repository root:
-
-```bash
-pnpm install
-pnpm build
-```
+Some Tauri packages will be automatically built when running one of the examples. Others, however, will need to be built beforehand. To build these automatically, run the `.scripts/setup.sh` (Linux and macOS) or `.scripts/setup.ps1` (Windows) script. This will install the Rust and Node.js CLI and build the JS API. After that, you should be able to run all the examples. Note that the setup script should be executed from the root folder of the repository in order to run correctly.
 
 ### Overview
 
 See [Architecture](../ARCHITECTURE.md#major-components) for an overview of the packages in this repository.
 
-### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils)
-
-The code for the Rust crates, including the Core, Macros, Utils, WRY runtime, and a few more are located in the [main Tauri repository](https://github.com/tauri-apps/tauri/tree/dev/crates).
-
-The easiest way to test your changes is to use the [helloworld](https://github.com/tauri-apps/tauri/tree/dev/examples/helloworld) example app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `cargo run --example helloworld` after making changes to test them out.
-
-To test local changes against your own application simply point the Tauri create to your local repository. In `src-tauri/Cargo.toml` file change:
-
-`tauri = { version = "2.1.1" }`
-
-to:
-
-`tauri = { path = "path/to/local/tauri/crates/tauri" }`
-
-If any other crates depend on Tauri you will have to point them to the local repo as well.
-
 ### Developing Tauri Bundler and Rust CLI
 
-The code for the bundler is located in [crates/tauri-bundler](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-bundler), and the code for the Rust CLI is located in [tauri-cli](https://github.com/tauri-apps/tauri/tree/dev/crates/tauri-cli).
-Running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package.
-You can use `cargo install --path . --debug` to speed up test builds.
+The code for the bundler is located in `[Tauri repo root]/crates/tauri-bundler`, and the code for the Rust CLI is located in `[Tauri repo root]/crates/tauri-cli`. If you are using your local copy of `@tauri-apps/cli` (see above), any changes you make to the bundler and CLI will be automatically built and applied when running the build or dev command. Otherwise, running `cargo install --path .` in the Rust CLI directory will allow you to run `cargo tauri build` and `cargo tauri dev` anywhere, using the updated copy of the bundler and cli. You will have to run this command each time you make a change in either package.
 
 ### Developing The Node.js CLI (`@tauri-apps/cli`)
 
-[`@tauri-apps/cli`](https://github.com/tauri-apps/tauri/tree/dev/packages/cli) is a small wrapper around `tauri-cli` so most changes should be happen in the Rust CLI (see above).
+`@tauri-apps/cli` is a wrapper to `tauri-cli` so most changes should be written on the Rust CLI. The `[Tauri repo root]/crates/tauri-cli` folder contains only packaging scripts to properly publish the Rust CLI binaries to NPM.
+
+### Developing Tauri Core and Related Components (Rust API, Macros, Codegen, and Utils)
+
+The code for the Rust crates, including the Core, Macros, Utils, WRY runtime, and a few more are located in `[Tauri repo root]/crates/tauri-(macros/utils)`. The easiest way to test your changes is to use the `[Tauri repo root]/examples/helloworld` app. It automatically rebuilds and uses your local copy of the Tauri core packages. Just run `cargo run --example helloworld` after making changes to test them out.
 
 #### Building the documentation locally
 
 You can build the Rust documentation locally running the following script:
 
 ```bash
-$ cargo +nightly doc --all-features --open
+$ RUSTDOCFLAGS="--cfg docsrs" cargo +nightly doc --all-features --open
 ```
 
 ### Developing the JS API
 
-The JS API provides bindings between the developer's JS in the Webview and the built-in Tauri APIs, written in Rust. Its code is located in [/packages/api](https://github.com/tauri-apps/tauri/tree/dev/packages/api).
-After making changes to the code, run `pnpm build` to build it. To test your changes, we recommend using the API example app, located in [/examples/api](https://github.com/tauri-apps/tauri/tree/dev/examples/api). It will automatically use your local copy of the JS API and provides a helpful UI to test the various commands.
+The JS API provides bindings between the developer's JS in the Webview and the builtin Tauri APIs, written in Rust. Its code is located in `[Tauri repo root]/packages/api`. After making changes to the code, run `pnpm build` to build it. To test your changes, we recommend using the API example app, located in `[Tauri repo root]/examples/api`. It will automatically use your local copy of the JS API and provides a helpful UI to test the various commands.
 
 ## Financial Contribution
 

.github/RELEASING.md

@@ -33,6 +33,11 @@ Releasing can be as easy as merging the version pull request but here is a check
 
 - [ ] Double check that every package is bumped correctly and there are no accidental major or minor being released unless that is indeed the intention.
 - [ ] Make sure that there are no pending or unfinished [covector-version-or-publish.yml](./workflows/covector-version-or-publish.yml) workflow runs.
+- [ ] Sign the Version PR before merging as we require signed commits
+  - [ ] `git fetch --all`
+  - [ ] `git checkout release/version-updates`
+  - [ ] `git commit --amend -S`
+  - [ ] `git push --force`
 - [ ] Approve and merge the version pull request
 
 ## Publishing failed, what to do?

.github/workflows/audit.yml

@@ -34,7 +34,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'

.github/workflows/check-generated-files.yml

@@ -8,7 +8,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/check-generated-files.yml'
-      - 'pnpm-lock.yaml'
       - 'packages/api/src/**'
       - 'crates/tauri/scripts/bundle.global.js'
       - 'crates/tauri-utils/src/config.rs'
@@ -32,7 +31,6 @@ jobs:
         with:
           filters: |
             api:
-              - 'pnpm-lock.yaml'
               - 'packages/api/src/**'
               - 'crates/tauri/scripts/bundle.global.js'
             schema:
@@ -46,7 +44,7 @@ jobs:
     if: needs.changes.outputs.api == 'true'
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'

.github/workflows/covector-version-or-publish.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 20
@@ -36,7 +36,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2 librsvg2-dev
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev libfuse2
 
       - uses: Swatinem/rust-cache@v2
 
@@ -73,11 +73,12 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 20
           registry-url: 'https://registry.npmjs.org'
+          cache: 'pnpm'
 
       - name: cargo login
         run: cargo login ${{ secrets.ORG_CRATES_IO_TOKEN }}
@@ -89,7 +90,7 @@ jobs:
       - name: install Linux dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
 
       - name: covector version or publish (publish when no change files present)
         uses: jbolda/covector/packages/action@covector-v0
@@ -110,7 +111,7 @@ jobs:
 
       - name: Create Pull Request With Versions Bumped
         if: steps.covector.outputs.commandRan == 'version'
-        uses: peter-evans/create-pull-request@67ccf781d68cd99b580ae25a5c18a1cc84ffff1f # 7.0.6
+        uses: tauri-apps/create-pull-request@v3
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: release/version-updates
@@ -118,13 +119,12 @@ jobs:
           commit-message: 'apply version updates'
           labels: 'version updates'
           body: ${{ steps.covector.outputs.change }}
-          sign-commits: true
 
       - name: Trigger doc update
         if: |
           steps.covector.outputs.successfulPublish == 'true' &&
           steps.covector.outputs.packagesPublished != ''
-        uses: peter-evans/repository-dispatch@ff45666b9427631e3450c54a1bcbee4d9ff4d7c0 # 3.0.0
+        uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.ORG_TAURI_BOT_PAT }}
           repository: tauri-apps/tauri-docs

.github/workflows/docker.yml

@@ -66,7 +66,7 @@ jobs:
         with:
           targets: ${{ matrix.target.name }}
 
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/fmt.yml

@@ -26,7 +26,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'

.github/workflows/lint-js.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'
@@ -31,7 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - uses: actions/setup-node@v4
         with:
           node-version: 'lts/*'

.github/workflows/lint-rust.yml

@@ -10,7 +10,7 @@ on:
       - dev
   pull_request:
     paths:
-      - '.github/workflows/lint-rust.yml'
+      - '.github/workflows/lint-cli.yml'
       - 'crates/**'
 
 env:

.github/workflows/publish-cli-js.yml

@@ -43,16 +43,15 @@ jobs:
           - host: windows-latest
             architecture: x64
             target: aarch64-pc-windows-msvc
-            build: pnpm build --target aarch64-pc-windows-msvc
-          - host: ubuntu-22.04
+            build: pnpm build --target aarch64-pc-windows-msvc --features native-tls-vendored --cargo-flags="--no-default-features"
+          - host: ubuntu-20.04
             target: x86_64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian
             build: |
-              npm i -g --force corepack
               cd packages/cli
               pnpm build --target x86_64-unknown-linux-gnu
               strip *.node
-          - host: ubuntu-22.04
+          - host: ubuntu-20.04
             target: x86_64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
             build: |
@@ -64,15 +63,14 @@ jobs:
             build: |
               pnpm build --features native-tls-vendored --target=aarch64-apple-darwin
               strip -x *.node
-          - host: ubuntu-22.04
+          - host: ubuntu-20.04
             target: aarch64-unknown-linux-gnu
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-debian-aarch64
             build: |
-              npm i -g --force corepack
               cd packages/cli
               pnpm build --target aarch64-unknown-linux-gnu
               aarch64-unknown-linux-gnu-strip *.node
-          - host: ubuntu-22.04
+          - host: ubuntu-20.04
             architecture: x64
             target: armv7-unknown-linux-gnueabihf
             setup: |
@@ -81,7 +79,7 @@ jobs:
             build: |
               pnpm build --target=armv7-unknown-linux-gnueabihf
               arm-linux-gnueabihf-strip *.node
-          - host: ubuntu-22.04
+          - host: ubuntu-20.04
             architecture: x64
             target: aarch64-unknown-linux-musl
             docker: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
@@ -90,20 +88,11 @@ jobs:
               rustup target add aarch64-unknown-linux-musl
               pnpm build --target aarch64-unknown-linux-musl
               /aarch64-linux-musl-cross/bin/aarch64-linux-musl-strip *.node
-          - host: ubuntu-22.04
-            architecture: x64
-            target: riscv64gc-unknown-linux-gnu
-            setup: |
-              sudo apt-get update
-              sudo apt-get install gcc-riscv64-linux-gnu g++-riscv64-linux-gnu -y
-            build: |
-              pnpm build --target=riscv64gc-unknown-linux-gnu
-              riscv64-linux-gnu-strip *.node
     name: stable - ${{ matrix.settings.target }} - node@20
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         if: ${{ !matrix.settings.docker }}
@@ -119,6 +108,7 @@ jobs:
       - uses: Swatinem/rust-cache@v1
         with:
           key: ${{ matrix.settings.target }}
+          working-directory: 'crates/tauri-cli/'
         if: ${{ matrix.settings.docker }}
       - name: Setup toolchain
         run: ${{ matrix.settings.setup }}
@@ -213,7 +203,7 @@ jobs:
     runs-on: ${{ matrix.settings.host }}
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -244,7 +234,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -263,7 +253,7 @@ jobs:
       - name: install system dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
       - name: Test bindings
         run: pnpm test
   test-linux-x64-musl-binding:
@@ -281,7 +271,7 @@ jobs:
       image: ghcr.io/napi-rs/napi-rs/nodejs-rust:lts-alpine
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:
@@ -319,6 +309,7 @@ jobs:
           - '20'
         image:
           - ghcr.io/napi-rs/napi-rs/nodejs:aarch64-16
+          - ghcr.io/napi-rs/napi-rs/nodejs:armhf-16
     runs-on: ubuntu-latest
     steps:
       - run: docker run --rm --privileged multiarch/qemu-user-static:register --reset
@@ -371,7 +362,7 @@ jobs:
       id-token: write # npm provenance
     steps:
       - uses: actions/checkout@v4
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: Setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/publish-cli-rs.yml

@@ -18,7 +18,7 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             rust_target: x86_64-unknown-linux-gnu
             ext: ''
             args: ''
@@ -37,63 +37,36 @@ jobs:
           - os: windows-latest
             rust_target: aarch64-pc-windows-msvc
             ext: '.exe'
-            args: ''
-          - os: ubuntu-22.04
-            rust_target: riscv64gc-unknown-linux-gnu
-            ext: ''
-            args: ''
-            cross: true
+            args: '--no-default-features --features native-tls-vendored'
 
     steps:
       - uses: actions/checkout@v4
 
       - name: 'Setup Rust'
-        if: ${{ !matrix.config.cross }}
         uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.config.rust_target }}
 
       - uses: Swatinem/rust-cache@v2
-        if: ${{ !matrix.config.cross }}
         with:
           key: ${{ matrix.config.rust_target }}
 
       - name: install Linux dependencies
-        if: ${{ !matrix.config.cross && startsWith(matrix.config.os, 'ubuntu') }}
+        if: matrix.config.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev
 
-      - name: Install cross
-        if: ${{ matrix.config.cross }}
-        uses: taiki-e/install-action@v2
-        with:
-          tool: cross@0.2.5
-
       - name: Build CLI
-        if: ${{ !matrix.config.cross }}
         run: cargo build --manifest-path ./crates/tauri-cli/Cargo.toml --profile release-size-optimized ${{ matrix.config.args }}
 
-      - name: Build CLI (cross)
-        if: ${{ matrix.config.cross }}
-        run: cross build --manifest-path ./crates/tauri-cli/Cargo.toml --target ${{ matrix.config.rust_target }} --profile release-size-optimized ${{ matrix.config.args }}
-
       - name: Upload CLI
-        if: ${{ !matrix.config.cross }}
         uses: actions/upload-artifact@v4
         with:
           name: cargo-tauri-${{ matrix.config.rust_target }}${{ matrix.config.ext }}
           path: target/release-size-optimized/cargo-tauri${{ matrix.config.ext }}
           if-no-files-found: error
 
-      - name: Upload CLI (cross)
-        if: ${{ matrix.config.cross }}
-        uses: actions/upload-artifact@v4
-        with:
-          name: cargo-tauri-${{ matrix.config.rust_target }}${{ matrix.config.ext }}
-          path: target/${{ matrix.config.rust_target }}/release-size-optimized/cargo-tauri${{ matrix.config.ext }}
-          if-no-files-found: error
-
   upload:
     needs: build
     runs-on: ubuntu-latest

.github/workflows/supply-chain.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Install Rust
         run: rustup update stable && rustup default stable
 
-      - uses: actions/cache@v4
+      - uses: actions/cache@v2
         with:
           path: ${{ runner.tool_cache }}/cargo-vet
           key: cargo-vet-bin-${{ env.CARGO_VET_VERSION }}

.github/workflows/test-android.yml

@@ -33,8 +33,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - name: install Rust 1.77.2
-        uses: dtolnay/rust-toolchain@1.77.2
+      - name: install Rust stable
+        uses: dtolnay/rust-toolchain@stable
 
       - name: install Linux dependencies
         if: matrix.platform == 'ubuntu-latest'
@@ -42,7 +42,7 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1
 
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: setup node
         uses: actions/setup-node@v4
         with:

.github/workflows/test-cli-js.yml

@@ -11,7 +11,6 @@ on:
   pull_request:
     paths:
       - '.github/workflows/test-cli-js.yml'
-      - 'packages/cli/**'
       # currently` @tauri-apps/cli` only tests the template
       - 'crates/tauri-cli/templates/app/**'
 
@@ -38,7 +37,7 @@ jobs:
       - name: install Rust stable
         uses: dtolnay/rust-toolchain@stable
 
-      - run: npm i -g --force corepack
+      - run: corepack enable
       - name: setup node
         uses: actions/setup-node@v4
         with:
@@ -49,7 +48,7 @@ jobs:
         if: matrix.platform == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y webkit2gtk-4.1 libayatana-appindicator3-dev
 
       - uses: Swatinem/rust-cache@v2
 

.github/workflows/test-cli-rs.yml

@@ -44,7 +44,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: 'Setup Rust'
-        uses: dtolnay/rust-toolchain@1.77.2
+        uses: dtolnay/rust-toolchain@stable
         with:
           targets: ${{ matrix.platform.target }}
 
@@ -52,7 +52,7 @@ jobs:
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
           sudo apt-get update
-          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev
+          sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev
 
       - uses: Swatinem/rust-cache@v2
 

.github/workflows/test-core.yml

@@ -88,17 +88,27 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y webkit2gtk-4.1 libxdo-dev libayatana-appindicator3-dev
 
+      - name: downgrade crates with MSRV conflict
+        run: |
+          cargo update -p ravif --precise 0.11.5
+          cargo update -p aws-config --precise 1.5.5
+          cargo update -p aws-sdk-ssooidc --precise 1.40.0
+          cargo update -p aws-sdk-s3 --precise 1.46.0
+          cargo update -p aws-sdk-sts --precise 1.39.0
+          cargo update -p aws-sdk-sso --precise 1.39.0
+          cargo update -p bitstream-io --precise 2.3.0
+
       - uses: Swatinem/rust-cache@v2
         with:
-          prefix-key: v3
+          prefix-key: v2
           save-if: ${{ matrix.features.key == 'all' }}
 
       - name: test
         if: ${{ !matrix.platform.cross }}
-        run: cargo ${{ matrix.features.key == 'no-default' && 'check' || matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }} --manifest-path crates/tauri/Cargo.toml
+        run: cargo ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }} --manifest-path crates/tauri/Cargo.toml
 
       - name: test (using cross)
         if: ${{ matrix.platform.cross }}
         run: |
-          cargo install cross --git https://github.com/cross-rs/cross --rev 51f46f296253d8122c927c5bb933e3c4f27cc317 --locked
-          cross ${{ matrix.features.key == 'no-default' && 'check' || matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }} --manifest-path crates/tauri/Cargo.toml
+          cargo install cross --git https://github.com/cross-rs/cross --rev ac4c11cedc97cd7c27faed36e55377a90e6ed618 --locked
+          cross ${{ matrix.platform.command }} --target ${{ matrix.platform.target }} ${{ matrix.features.args }} --manifest-path crates/tauri/Cargo.toml

.gitignore

@@ -1,55 +1,52 @@
-# dependency directories
-node_modules/
-
-# Optional npm and yarn cache directory
-.npm/
-.yarn/
-
-# Output of 'npm pack'
-*.tgz
-
-# dotenv environment variables file
-.env
-
-# .vscode workspace settings file
-.vscode/settings.json
-.vscode/launch.json
-.vscode/tasks.json
-
-# npm, yarn and bun lock files
-package-lock.json
-yarn.lock
-bun.lockb
-
-# rust compiled folders
-target/
-
-# test video for streaming example
-streaming_example_test_video.mp4
-
-# examples /gen directory
-/examples/**/src-tauri/gen/
-/bench/**/src-tauri/gen/
-
-# logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-
-# runtime data
-pids
-*.pid
-*.seed
-*.pid.lock
-
-# miscellaneous
-/.vs
-.DS_Store
-.Thumbs.db
-*.sublime*
-.idea
-debug.log
-TODO.md
-.aider*
+# dependency directories
+node_modules/
+
+# Optional npm and yarn cache directory
+.npm/
+.yarn/
+
+# Output of 'npm pack'
+*.tgz
+
+# dotenv environment variables file
+.env
+
+# .vscode workspace settings file
+.vscode/settings.json
+
+# npm, yarn and bun lock files
+package-lock.json
+yarn.lock
+bun.lockb
+
+# rust compiled folders
+target/
+
+# test video for streaming example
+streaming_example_test_video.mp4
+
+# examples /gen directory
+/examples/**/src-tauri/gen/
+/bench/**/src-tauri/gen/
+
+# logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# miscellaneous
+/.vs
+.DS_Store
+.Thumbs.db
+*.sublime*
+.idea
+debug.log
+TODO.md

.prettierrc

@@ -1,6 +1,5 @@
 {
   "singleQuote": true,
   "semi": false,
-  "trailingComma": "none",
-  "experimentalOperatorPosition": "start"
+  "trailingComma": "none"
 }

.scripts/ci/check-change-tags.js

@@ -57,7 +57,7 @@ function checkChangeFiles(changeFiles) {
     for (const [file, packages] of unknownTagsEntries) {
       for (const { package, tag } of packages) {
         console.error(
-          `Package \`${package}\` has an unknown change tag ${tag} in ${file} `
+          `Package \`${package}\` has an uknown change tag ${tag} in ${file} `
         )
       }
     }

.scripts/ci/check-license-header.js

@@ -28,8 +28,8 @@ const ignore = [
 
 async function checkFile(file) {
   if (
-    extensions.some((e) => file.endsWith(e))
-    && !ignore.some((i) => file.includes(`/${i}/`) || path.basename(file) === i)
+    extensions.some((e) => file.endsWith(e)) &&
+    !ignore.some((i) => file.includes(`/${i}/`) || path.basename(file) == i)
   ) {
     const fileStream = fs.createReadStream(file)
     const rl = readline.createInterface({
@@ -42,11 +42,11 @@ async function checkFile(file) {
     for await (let line of rl) {
       // ignore empty lines, allow shebang and bundler license
       if (
-        line.length === 0
-        || line.startsWith('#!')
-        || line.startsWith('// swift-tools-version:')
-        || line === bundlerLicense
-        || line === denoLicense
+        line.length === 0 ||
+        line.startsWith('#!') ||
+        line.startsWith('// swift-tools-version:') ||
+        line === bundlerLicense ||
+        line === denoLicense
       ) {
         continue
       }

.taurignore

@@ -0,0 +1,16 @@
+.changes
+.devcontainer
+.docker
+.github
+.scripts
+.vscode
+audits
+bench
+packages/api
+packages/cli
+crates/tauri-cli
+crates/tauri-bundler
+crates/tauri-driver
+crates/tauri-macos-sign
+crates/tauri-schema-generator
+crates/tests

Cargo.toml

@@ -70,5 +70,3 @@ opt-level = "s"
 [patch.crates-io]
 schemars_derive = { git = 'https://github.com/tauri-apps/schemars.git', branch = 'feat/preserve-description-newlines' }
 tauri = { path = "./crates/tauri" }
-tauri-plugin = { path = "./crates/tauri-plugin" }
-tauri-utils = { path = "./crates/tauri-utils" }

LICENSE.spdx

@@ -6,7 +6,7 @@ PackageSupplier: Organization: The Tauri Programme in the Commons Conservancy
 PackageHomePage: https://tauri.app
 PackageLicenseDeclared: Apache-2.0
 PackageLicenseDeclared: MIT
-PackageCopyrightText: 2019-2025, The Tauri Programme in the Commons Conservancy
+PackageCopyrightText: 2019-2024, The Tauri Programme in the Commons Conservancy
 PackageSummary: <text>Tauri is a rust project that enables developers to make secure
 and small desktop applications using a web frontend.
                 </text>

README.md

@@ -4,7 +4,7 @@
 [![License](https://img.shields.io/badge/License-MIT%20or%20Apache%202-green.svg)](https://opencollective.com/tauri)
 [![test core](https://img.shields.io/github/actions/workflow/status/tauri-apps/tauri/test-core.yml?label=test%20core&logo=github)](https://github.com/tauri-apps/tauri/actions/workflows/test-core.yml)
 [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri.svg?type=shield)](https://app.fossa.com/projects/git%2Bgithub.com%2Ftauri-apps%2Ftauri?ref=badge_shield)
-[![Chat Server](https://img.shields.io/badge/chat-discord-7289da.svg)](https://discord.com/invite/tauri)
+[![Chat Server](https://img.shields.io/badge/chat-discord-7289da.svg)](https://discord.gg/SpmNs4S)
 [![website](https://img.shields.io/badge/website-tauri.app-purple.svg)](https://tauri.app)
 [![https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg](https://good-labs.github.io/greater-good-affirmation/assets/images/badge.svg)](https://good-labs.github.io/greater-good-affirmation)
 [![support](https://img.shields.io/badge/sponsor-Open%20Collective-blue.svg)](https://opencollective.com/tauri)
@@ -35,7 +35,7 @@ The list of Tauri's features includes, but is not limited to:
 - Built-in self updater (desktop only)
 - System tray icons
 - Native notifications
-- Native WebView Protocol (tauri doesn't create a localhost http(s) server to serve the WebView contents)
+- [Localhost free (🔥)](https://github.com/tauri-apps/tauri/issues/10510)
 - GitHub action for streamlined CI
 - VS Code extension
 
@@ -43,13 +43,13 @@ The list of Tauri's features includes, but is not limited to:
 
 Tauri currently supports development and distribution on the following platforms:
 
-| Platform   | Versions                                                                                                        |
-| :--------- | :-------------------------------------------------------------------------------------------------------------- |
-| Windows    | 7 and above                                                                                                     |
-| macOS      | 10.15 and above                                                                                                 |
-| Linux      | webkit2gtk 4.0 for Tauri v1 (for example Ubuntu 18.04). webkit2gtk 4.1 for Tauri v2 (for example Ubuntu 22.04). |
-| iOS/iPadOS | 9 and above                                                                                                     |
-| Android    | 7 and above (currently 8 and above)                                                                             |
+| Platform          | Versions                                                                                                        |
+| :---------------- | :-------------------------------------------------------------------------------------------------------------- |
+| Windows           | 7 and above                                                                                                     |
+| macOS             | 10.15 and above                                                                                                 |
+| Linux             | webkit2gtk 4.0 for Tauri v1 (for example Ubuntu 18.04). webkit2gtk 4.1 for Tauri v2 (for example Ubuntu 22.04). |
+| iOS/iPadOS (beta) | 9 and above                                                                                                     |
+| Android (beta)    | 7 and above                                                                                                     |
 
 ## Contributing
 
@@ -81,7 +81,7 @@ For the complete list of sponsors please visit our [website](https://tauri.app#s
 
 ## Organization
 
-Tauri aims to be a sustainable collective based on principles that guide sustainable free and open software communities. To this end it has become a Programme within the [Commons Conservancy](https://commonsconservancy.org/), and you can contribute financially via [Open Collective](https://opencollective.com/tauri).
+Tauri aims to be a sustainable collective based on principles that guide [sustainable free and open software communities](https://sfosc.org). To this end it has become a Programme within the [Commons Conservancy](https://commonsconservancy.org/), and you can contribute financially via [Open Collective](https://opencollective.com/tauri).
 
 ## Licenses
 

bench/Cargo.toml

@@ -9,11 +9,11 @@ description = "Cross-platform WebView rendering library"
 repository = "https://github.com/tauri-apps/wry"
 
 [dependencies]
-anyhow = "1"
+anyhow = "1.0.40"
 time = { version = "0.3", features = ["formatting"] }
-tempfile = "3"
-serde_json = "1"
-serde = { version = "1", features = ["derive"] }
+tempfile = "3.2.0"
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 
 [[bin]]
 name = "run_benchmark"

bench/src/build_benchmark_jsons.rs

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+//! [![](https://github.com/tauri-apps/tauri/raw/dev/.github/splash.png)](https://tauri.app)
+//!
 //! This Rust binary runs on CI and provides internal metrics results of Tauri. To learn more see [benchmark_results](https://github.com/tauri-apps/benchmark_results) repository.
 //!
 //! ***_Internal use only_**
@@ -10,8 +12,6 @@
   html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png",
   html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png"
 )]
-// file is used by multiple binaries
-#![allow(dead_code)]
 
 use std::{fs::File, io::BufReader};
 mod utils;
@@ -54,7 +54,7 @@ fn main() {
       .expect("Something wrong with tauri_data"),
     &serde_json::to_value(all_data).expect("Unable to build final json (all)"),
   )
-  .unwrap_or_else(|_| panic!("Unable to write {tauri_data:?}"));
+  .unwrap_or_else(|_| panic!("Unable to write {:?}", tauri_data));
 
   utils::write_json(
     tauri_recent
@@ -62,5 +62,5 @@ fn main() {
       .expect("Something wrong with tauri_recent"),
     &serde_json::to_value(recent).expect("Unable to build final json (recent)"),
   )
-  .unwrap_or_else(|_| panic!("Unable to write {tauri_recent:?}"));
+  .unwrap_or_else(|_| panic!("Unable to write {:?}", tauri_recent));
 }

bench/src/run_benchmark.rs

@@ -2,17 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-//! This Rust binary runs on CI and provides internal metrics results of Tauri.
-//! To learn more see [benchmark_results](https://github.com/tauri-apps/benchmark_results) repository.
+//! [![](https://github.com/tauri-apps/tauri/raw/dev/.github/splash.png)](https://tauri.app)
 //!
-//! ***_Internal use only_***
+//! This Rust binary runs on CI and provides internal metrics results of Tauri. To learn more see [benchmark_results](https://github.com/tauri-apps/benchmark_results) repository.
+//!
+//! ***_Internal use only_**
 
 #![doc(
   html_logo_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png",
   html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/.github/icon.png"
 )]
 
-use anyhow::{Context, Result};
+use anyhow::Result;
 use std::{
   collections::{HashMap, HashSet},
   env,
@@ -22,66 +23,62 @@ use std::{
 
 mod utils;
 
-/// The list of examples for benchmarks
-fn get_all_benchmarks(target: &str) -> Vec<(String, String)> {
+/// The list of the examples of the benchmark name and binary relative path
+fn get_all_benchmarks() -> Vec<(String, String)> {
   vec![
     (
       "tauri_hello_world".into(),
-      format!("../target/{target}/release/bench_helloworld"),
+      format!("../target/{}/release/bench_helloworld", utils::get_target()),
     ),
     (
       "tauri_cpu_intensive".into(),
-      format!("../target/{target}/release/bench_cpu_intensive"),
+      format!(
+        "../target/{}/release/bench_cpu_intensive",
+        utils::get_target()
+      ),
     ),
     (
       "tauri_3mb_transfer".into(),
-      format!("../target/{target}/release/bench_files_transfer"),
+      format!(
+        "../target/{}/release/bench_files_transfer",
+        utils::get_target()
+      ),
     ),
   ]
 }
 
-fn run_strace_benchmarks(new_data: &mut utils::BenchResult, target: &str) -> Result<()> {
+fn run_strace_benchmarks(new_data: &mut utils::BenchResult) -> Result<()> {
   use std::io::Read;
 
   let mut thread_count = HashMap::<String, u64>::new();
   let mut syscall_count = HashMap::<String, u64>::new();
 
-  for (name, example_exe) in get_all_benchmarks(target) {
-    let mut file = tempfile::NamedTempFile::new()
-      .context("failed to create temporary file for strace output")?;
-
-    let exe_path = utils::bench_root_path().join(&example_exe);
-    let exe_path_str = exe_path
-      .to_str()
-      .context("executable path contains invalid UTF-8")?;
-    let temp_path_str = file
-      .path()
-      .to_str()
-      .context("temporary file path contains invalid UTF-8")?;
+  for (name, example_exe) in get_all_benchmarks() {
+    let mut file = tempfile::NamedTempFile::new()?;
 
     Command::new("strace")
-      .args(["-c", "-f", "-o", temp_path_str, exe_path_str])
+      .args([
+        "-c",
+        "-f",
+        "-o",
+        file.path().to_str().unwrap(),
+        utils::bench_root_path().join(example_exe).to_str().unwrap(),
+      ])
       .stdout(Stdio::inherit())
-      .spawn()
-      .context("failed to spawn strace process")?
-      .wait()
-      .context("failed to wait for strace process")?;
+      .spawn()?
+      .wait()?;
 
     let mut output = String::new();
-    file
-      .as_file_mut()
-      .read_to_string(&mut output)
-      .context("failed to read strace output")?;
+    file.as_file_mut().read_to_string(&mut output)?;
 
     let strace_result = utils::parse_strace_output(&output);
-    // Count clone/clone3 syscalls as thread creation indicators
-    let clone_calls = strace_result.get("clone").map(|d| d.calls).unwrap_or(0)
+    // Note, we always have 1 thread. Use cloneX calls as counter for additional threads created.
+    let clone = 1
+      + strace_result.get("clone").map(|d| d.calls).unwrap_or(0)
       + strace_result.get("clone3").map(|d| d.calls).unwrap_or(0);
-
-    if let Some(total) = strace_result.get("total") {
-      thread_count.insert(name.clone(), clone_calls);
-      syscall_count.insert(name, total.calls);
-    }
+    let total = strace_result.get("total").unwrap().calls;
+    thread_count.insert(name.to_string(), clone);
+    syscall_count.insert(name.to_string(), total);
   }
 
   new_data.thread_count = thread_count;
@@ -90,100 +87,70 @@ fn run_strace_benchmarks(new_data: &mut utils::BenchResult, target: &str) -> Res
   Ok(())
 }
 
-fn run_max_mem_benchmark(target: &str) -> Result<HashMap<String, u64>> {
+fn run_max_mem_benchmark() -> Result<HashMap<String, u64>> {
   let mut results = HashMap::<String, u64>::new();
 
-  for (name, example_exe) in get_all_benchmarks(target) {
-    let benchmark_file = utils::target_dir().join(format!("mprof{name}_.dat"));
-    let benchmark_file_str = benchmark_file
-      .to_str()
-      .context("benchmark file path contains invalid UTF-8")?;
-
-    let exe_path = utils::bench_root_path().join(&example_exe);
-    let exe_path_str = exe_path
-      .to_str()
-      .context("executable path contains invalid UTF-8")?;
+  for (name, example_exe) in get_all_benchmarks() {
+    let benchmark_file = utils::target_dir().join(format!("mprof{}_.dat", name));
+    let benchmark_file = benchmark_file.to_str().unwrap();
 
     let proc = Command::new("mprof")
-      .args(["run", "-C", "-o", benchmark_file_str, exe_path_str])
+      .args([
+        "run",
+        "-C",
+        "-o",
+        benchmark_file,
+        utils::bench_root_path().join(example_exe).to_str().unwrap(),
+      ])
       .stdout(Stdio::null())
       .stderr(Stdio::piped())
-      .spawn()
-      .with_context(|| format!("failed to spawn mprof for benchmark {name}"))?;
+      .spawn()?;
 
-    let proc_result = proc
-      .wait_with_output()
-      .with_context(|| format!("failed to wait for mprof {name}"))?;
-
-    if !proc_result.status.success() {
-      eprintln!(
-        "mprof failed for {name}: {}",
-        String::from_utf8_lossy(&proc_result.stderr)
-      );
-    }
-
-    if let Some(mem) = utils::parse_max_mem(benchmark_file_str)
-      .with_context(|| format!("failed to parse mprof data for {name}"))?
-    {
-      results.insert(name, mem);
-    }
-
-    // Clean up the temporary file
-    if let Err(e) = std::fs::remove_file(&benchmark_file) {
-      eprintln!("Warning: failed to remove temporary file {benchmark_file_str}: {e}");
-    }
+    let proc_result = proc.wait_with_output()?;
+    println!("{:?}", proc_result);
+    results.insert(
+      name.to_string(),
+      utils::parse_max_mem(benchmark_file).unwrap(),
+    );
   }
 
   Ok(results)
 }
 
-fn rlib_size(target_dir: &Path, prefix: &str) -> Result<u64> {
+fn rlib_size(target_dir: &std::path::Path, prefix: &str) -> u64 {
   let mut size = 0;
-  let mut seen = HashSet::new();
-
-  let deps_dir = target_dir.join("deps");
-  for entry in std::fs::read_dir(&deps_dir).with_context(|| {
-    format!(
-      "failed to read target deps directory: {}",
-      deps_dir.display()
-    )
-  })? {
-    let entry = entry.context("failed to read directory entry")?;
-    let name = entry.file_name().to_string_lossy().to_string();
+  let mut seen = std::collections::HashSet::new();
 
+  for entry in std::fs::read_dir(target_dir.join("deps")).unwrap() {
+    let entry = entry.unwrap();
+    let os_str = entry.file_name();
+    let name = os_str.to_str().unwrap();
     if name.starts_with(prefix) && name.ends_with(".rlib") {
-      if let Some(start) = name.split('-').next() {
-        if seen.insert(start.to_string()) {
-          size += entry
-            .metadata()
-            .context("failed to read file metadata")?
-            .len();
-        }
+      let start = name.split('-').next().unwrap().to_string();
+      if seen.contains(&start) {
+        println!("skip {}", name);
+      } else {
+        seen.insert(start);
+        size += entry.metadata().unwrap().len();
+        println!("check size {} {}", name, size);
       }
     }
   }
-
-  if size == 0 {
-    anyhow::bail!(
-      "no rlib files found for prefix {prefix} in {}",
-      deps_dir.display()
-    );
-  }
-
-  Ok(size)
+  assert!(size > 0);
+  size
 }
 
-fn get_binary_sizes(target_dir: &Path, target: &str) -> Result<HashMap<String, u64>> {
+fn get_binary_sizes(target_dir: &Path) -> Result<HashMap<String, u64>> {
   let mut sizes = HashMap::<String, u64>::new();
 
-  let wry_size = rlib_size(target_dir, "libwry")?;
+  let wry_size = rlib_size(target_dir, "libwry");
+  println!("wry {} bytes", wry_size);
   sizes.insert("wry_rlib".to_string(), wry_size);
 
-  for (name, example_exe) in get_all_benchmarks(target) {
-    let exe_path = utils::bench_root_path().join(&example_exe);
-    let meta = std::fs::metadata(&exe_path)
-      .with_context(|| format!("failed to read metadata for {}", exe_path.display()))?;
-    sizes.insert(name, meta.len());
+  // add size for all EXEC_TIME_BENCHMARKS
+  for (name, example_exe) in get_all_benchmarks() {
+    let meta = std::fs::metadata(example_exe).unwrap();
+    sizes.insert(name.to_string(), meta.len());
   }
 
   Ok(sizes)
@@ -223,33 +190,14 @@ fn cargo_deps() -> HashMap<String, usize> {
       cmd.args(["--target", target]);
       cmd.current_dir(utils::tauri_root_path());
 
-      match cmd.output() {
-        Ok(output) if output.status.success() => {
-          let full_deps = String::from_utf8_lossy(&output.stdout);
-          let count = full_deps
-            .lines()
-            .collect::<HashSet<_>>()
-            .len()
-            .saturating_sub(1); // output includes wry itself
+      let full_deps = cmd.output().expect("failed to run cargo tree").stdout;
+      let full_deps = String::from_utf8(full_deps).expect("cargo tree output not utf-8");
+      let count = full_deps.lines().collect::<HashSet<_>>().len() - 1; // output includes wry itself
 
-          // set the count to the highest count seen for this OS
-          let existing = results.entry(os.to_string()).or_default();
-          *existing = count.max(*existing);
-
-          if count <= 10 {
-            eprintln!("Warning: dependency count for {target} seems low: {count}");
-          }
-        }
-        Ok(output) => {
-          eprintln!(
-            "cargo tree failed for {target}: {}",
-            String::from_utf8_lossy(&output.stderr)
-          );
-        }
-        Err(e) => {
-          eprintln!("Failed to run cargo tree for {target}: {e}");
-        }
-      }
+      // set the count to the highest count seen for this OS
+      let existing = results.entry(os.to_string()).or_default();
+      *existing = count.max(*existing);
+      assert!(count > 10); // sanity check
     }
   }
   results
@@ -257,127 +205,104 @@ fn cargo_deps() -> HashMap<String, usize> {
 
 const RESULT_KEYS: &[&str] = &["mean", "stddev", "user", "system", "min", "max"];
 
-fn run_exec_time(target: &str) -> Result<HashMap<String, HashMap<String, f64>>> {
-  let target_dir = utils::target_dir();
+fn run_exec_time(target_dir: &Path) -> Result<HashMap<String, HashMap<String, f64>>> {
   let benchmark_file = target_dir.join("hyperfine_results.json");
-  let benchmark_file_str = benchmark_file
-    .to_str()
-    .context("benchmark file path contains invalid UTF-8")?;
+  let benchmark_file = benchmark_file.to_str().unwrap();
 
-  let mut command = vec![
+  let mut command = [
     "hyperfine",
     "--export-json",
-    benchmark_file_str,
+    benchmark_file,
     "--show-output",
     "--warmup",
     "3",
-  ];
+  ]
+  .iter()
+  .map(|s| s.to_string())
+  .collect::<Vec<_>>();
 
-  let benchmarks = get_all_benchmarks(target);
-  let mut benchmark_paths = Vec::new();
-
-  for (_, example_exe) in &benchmarks {
-    let exe_path = utils::bench_root_path().join(example_exe);
-    let exe_path_str = exe_path
-      .to_str()
-      .context("executable path contains invalid UTF-8")?;
-    benchmark_paths.push(exe_path_str.to_string());
+  for (_, example_exe) in get_all_benchmarks() {
+    command.push(
+      utils::bench_root_path()
+        .join(example_exe)
+        .to_str()
+        .unwrap()
+        .to_string(),
+    );
   }
 
-  for path in &benchmark_paths {
-    command.push(path.as_str());
-  }
-
-  utils::run(&command)?;
+  utils::run(&command.iter().map(|s| s.as_ref()).collect::<Vec<_>>());
 
   let mut results = HashMap::<String, HashMap<String, f64>>::new();
-  let hyperfine_results = utils::read_json(benchmark_file_str)?;
-
-  if let Some(results_array) = hyperfine_results
-    .as_object()
-    .and_then(|obj| obj.get("results"))
-    .and_then(|val| val.as_array())
-  {
-    for ((name, _), data) in benchmarks.iter().zip(results_array.iter()) {
-      if let Some(data_obj) = data.as_object() {
-        let filtered_data: HashMap<String, f64> = data_obj
-          .iter()
-          .filter(|(key, _)| RESULT_KEYS.contains(&key.as_str()))
-          .filter_map(|(key, val)| val.as_f64().map(|v| (key.clone(), v)))
-          .collect();
-
-        results.insert(name.clone(), filtered_data);
-      }
-    }
+  let hyperfine_results = utils::read_json(benchmark_file)?;
+  for ((name, _), data) in get_all_benchmarks().iter().zip(
+    hyperfine_results
+      .as_object()
+      .unwrap()
+      .get("results")
+      .unwrap()
+      .as_array()
+      .unwrap(),
+  ) {
+    let data = data.as_object().unwrap().clone();
+    results.insert(
+      name.to_string(),
+      data
+        .into_iter()
+        .filter(|(key, _)| RESULT_KEYS.contains(&key.as_str()))
+        .map(|(key, val)| (key, val.as_f64().unwrap()))
+        .collect(),
+    );
   }
 
   Ok(results)
 }
 
 fn main() -> Result<()> {
+  // download big files if not present
   let json_3mb = utils::home_path().join(".tauri_3mb.json");
 
   if !json_3mb.exists() {
-    println!("Downloading test data...");
     utils::download_file(
       "https://github.com/lemarier/tauri-test/releases/download/v2.0.0/json_3mb.json",
       json_3mb,
-    )
-    .context("failed to download test data")?;
+    );
   }
 
   println!("Starting tauri benchmark");
 
   let target_dir = utils::target_dir();
-  let target = utils::get_target();
 
-  env::set_current_dir(utils::bench_root_path())
-    .context("failed to set working directory to bench root")?;
-
-  let now = std::time::SystemTime::now()
-    .duration_since(std::time::UNIX_EPOCH)
-    .context("failed to get current time")?;
-  let timestamp = format!("{}", now.as_secs());
-
-  println!("Running execution time benchmarks...");
-  let exec_time = run_exec_time(target)?;
-
-  println!("Getting binary sizes...");
-  let binary_size = get_binary_sizes(&target_dir, target)?;
-
-  println!("Analyzing cargo dependencies...");
-  let cargo_deps = cargo_deps();
+  env::set_current_dir(utils::bench_root_path())?;
 
+  let format =
+    time::format_description::parse("[year]-[month]-[day]T[hour]:[minute]:[second]Z").unwrap();
+  let now = time::OffsetDateTime::now_utc();
   let mut new_data = utils::BenchResult {
-    created_at: timestamp,
-    sha1: {
-      let output = utils::run_collect(&["git", "rev-parse", "HEAD"])?;
-      output.0.trim().to_string()
-    },
-    exec_time,
-    binary_size,
-    cargo_deps,
+    created_at: now.format(&format).unwrap(),
+    sha1: utils::run_collect(&["git", "rev-parse", "HEAD"])
+      .0
+      .trim()
+      .to_string(),
+    exec_time: run_exec_time(&target_dir)?,
+    binary_size: get_binary_sizes(&target_dir)?,
+    cargo_deps: cargo_deps(),
     ..Default::default()
   };
 
   if cfg!(target_os = "linux") {
-    println!("Running Linux-specific benchmarks...");
-    run_strace_benchmarks(&mut new_data, target)?;
-    new_data.max_memory = run_max_mem_benchmark(target)?;
+    run_strace_benchmarks(&mut new_data)?;
+    new_data.max_memory = run_max_mem_benchmark()?;
   }
 
   println!("===== <BENCHMARK RESULTS>");
-  serde_json::to_writer_pretty(std::io::stdout(), &new_data)
-    .context("failed to serialize benchmark results")?;
+  serde_json::to_writer_pretty(std::io::stdout(), &new_data)?;
   println!("\n===== </BENCHMARK RESULTS>");
 
-  let bench_file = target_dir.join("bench.json");
-  if let Some(filename) = bench_file.to_str() {
-    utils::write_json(filename, &serde_json::to_value(&new_data)?)
-      .context("failed to write benchmark results to file")?;
-    println!("Results written to: {filename}");
+  if let Some(filename) = target_dir.join("bench.json").to_str() {
+    utils::write_json(filename, &serde_json::to_value(&new_data)?)?;
   } else {
-    eprintln!("Cannot write bench.json, path contains invalid UTF-8");
+    eprintln!("Cannot write bench.json, path is invalid");
   }
 
   Ok(())

bench/src/utils.rs

@@ -2,16 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-//! Utility functions for benchmarking tasks in the Tauri project.
-//!
-//! This module provides helpers for:
-//! - Paths to project directories and targets
-//! - Running and collecting process outputs
-//! - Parsing memory profiler (`mprof`) and syscall profiler (`strace`) outputs
-//! - JSON read/write utilities
-//! - File download utilities (via `curl` or file copy)
-
-use anyhow::{bail, Context, Result};
+use anyhow::Result;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use std::{
@@ -22,7 +13,6 @@ use std::{
   process::{Command, Output, Stdio},
 };
 
-/// Holds the results of a benchmark run.
 #[derive(Default, Clone, Serialize, Deserialize, Debug)]
 pub struct BenchResult {
   pub created_at: String,
@@ -35,7 +25,7 @@ pub struct BenchResult {
   pub cargo_deps: HashMap<String, usize>,
 }
 
-/// Represents a single line of parsed `strace` output.
+#[allow(dead_code)]
 #[derive(Debug, Clone, Serialize)]
 pub struct StraceOutput {
   pub percent_time: f64,
@@ -45,7 +35,6 @@ pub struct StraceOutput {
   pub errors: u64,
 }
 
-/// Get the compilation target triple for the current platform.
 pub fn get_target() -> &'static str {
   #[cfg(target_os = "macos")]
   return if cfg!(target_arch = "aarch64") {
@@ -53,22 +42,18 @@ pub fn get_target() -> &'static str {
   } else {
     "x86_64-apple-darwin"
   };
-
   #[cfg(target_os = "ios")]
   return if cfg!(target_arch = "aarch64") {
     "aarch64-apple-ios"
   } else {
     "x86_64-apple-ios"
   };
-
   #[cfg(target_os = "linux")]
   return "x86_64-unknown-linux-gnu";
-
   #[cfg(target_os = "windows")]
-  unimplemented!("Windows target not implemented yet");
+  unimplemented!();
 }
 
-/// Get the `target/release` directory path for benchmarks.
 pub fn target_dir() -> PathBuf {
   bench_root_path()
     .join("..")
@@ -77,90 +62,83 @@ pub fn target_dir() -> PathBuf {
     .join("release")
 }
 
-/// Get the root path of the current benchmark crate.
 pub fn bench_root_path() -> PathBuf {
   PathBuf::from(env!("CARGO_MANIFEST_DIR"))
 }
 
-/// Get the home directory of the current user.
+#[allow(dead_code)]
 pub fn home_path() -> PathBuf {
   #[cfg(any(target_os = "macos", target_os = "ios", target_os = "linux"))]
-  {
-    PathBuf::from(std::env::var("HOME").unwrap_or_default())
-  }
-
+  return PathBuf::from(env!("HOME"));
   #[cfg(target_os = "windows")]
-  {
-    PathBuf::from(std::env::var("USERPROFILE").unwrap_or_default())
-  }
+  return PathBuf::from(env!("HOMEPATH"));
 }
 
-/// Get the root path of the Tauri repository.
+#[allow(dead_code)]
 pub fn tauri_root_path() -> PathBuf {
-  bench_root_path().parent().map(|p| p.to_path_buf()).unwrap()
+  bench_root_path().parent().unwrap().to_path_buf()
 }
 
-/// Run a command and collect its stdout and stderr as strings.
-/// Returns an error if the command fails or exits with a non-zero status.
-pub fn run_collect(cmd: &[&str]) -> Result<(String, String)> {
-  let output: Output = Command::new(cmd[0])
+#[allow(dead_code)]
+pub fn run_collect(cmd: &[&str]) -> (String, String) {
+  let mut process_builder = Command::new(cmd[0]);
+  process_builder
     .args(&cmd[1..])
     .stdin(Stdio::piped())
     .stdout(Stdio::piped())
-    .stderr(Stdio::piped())
-    .output()
-    .with_context(|| format!("failed to execute command: {cmd:?}"))?;
-
-  if !output.status.success() {
-    bail!(
-      "Command {:?} exited with {:?}\nstdout:\n{}\nstderr:\n{}",
-      cmd,
-      output.status.code(),
-      String::from_utf8_lossy(&output.stdout),
-      String::from_utf8_lossy(&output.stderr)
-    );
+    .stderr(Stdio::piped());
+  let prog = process_builder.spawn().expect("failed to spawn script");
+  let Output {
+    stdout,
+    stderr,
+    status,
+  } = prog.wait_with_output().expect("failed to wait on child");
+  let stdout = String::from_utf8_lossy(&stdout).to_string();
+  let stderr = String::from_utf8_lossy(&stderr).to_string();
+  if !status.success() {
+    eprintln!("stdout: <<<{}>>>", stdout);
+    eprintln!("stderr: <<<{}>>>", stderr);
+    panic!("Unexpected exit code: {:?}", status.code());
   }
-
-  Ok((
-    String::from_utf8_lossy(&output.stdout).to_string(),
-    String::from_utf8_lossy(&output.stderr).to_string(),
-  ))
+  (stdout, stderr)
 }
 
-/// Parse a memory profiler (`mprof`) output file and return the maximum
-/// memory usage in bytes. Returns `None` if no values are found.
-pub fn parse_max_mem(file_path: &str) -> Result<Option<u64>> {
-  let file = fs::File::open(file_path)
-    .with_context(|| format!("failed to open mprof output file {file_path}"))?;
+#[allow(dead_code)]
+pub fn parse_max_mem(file_path: &str) -> Option<u64> {
+  let file = fs::File::open(file_path).unwrap();
   let output = BufReader::new(file);
-
   let mut highest: u64 = 0;
-
+  // MEM 203.437500 1621617192.4123
   for line in output.lines().map_while(Result::ok) {
-    let split: Vec<&str> = line.split(' ').collect();
+    // split line by space
+    let split = line.split(' ').collect::<Vec<_>>();
     if split.len() == 3 {
-      if let Ok(mb) = split[1].parse::<f64>() {
-        let current_bytes = (mb * 1024.0 * 1024.0) as u64;
-        highest = highest.max(current_bytes);
+      // mprof generate result in MB
+      let current_bytes = str::parse::<f64>(split[1]).unwrap() as u64 * 1024 * 1024;
+      if current_bytes > highest {
+        highest = current_bytes;
       }
     }
   }
 
-  // Best-effort cleanup
-  let _ = fs::remove_file(file_path);
+  fs::remove_file(file_path).unwrap();
 
-  Ok(if highest > 0 { Some(highest) } else { None })
+  if highest > 0 {
+    return Some(highest);
+  }
+
+  None
 }
 
-/// Parse the output of `strace -c` and return a summary of syscalls.
+#[allow(dead_code)]
 pub fn parse_strace_output(output: &str) -> HashMap<String, StraceOutput> {
   let mut summary = HashMap::new();
 
   let mut lines = output
     .lines()
     .filter(|line| !line.is_empty() && !line.contains("detached ..."));
-
   let count = lines.clone().count();
+
   if count < 4 {
     return summary;
   }
@@ -170,91 +148,89 @@ pub fn parse_strace_output(output: &str) -> HashMap<String, StraceOutput> {
   let data_lines = lines.skip(2);
 
   for line in data_lines {
-    let syscall_fields: Vec<&str> = line.split_whitespace().collect();
+    let syscall_fields = line.split_whitespace().collect::<Vec<_>>();
     let len = syscall_fields.len();
+    let syscall_name = syscall_fields.last().unwrap();
 
-    if let Some(&syscall_name) = syscall_fields.last() {
-      if (5..=6).contains(&len) {
-        let output = StraceOutput {
-          percent_time: syscall_fields[0].parse().unwrap_or(0.0),
-          seconds: syscall_fields[1].parse().unwrap_or(0.0),
-          usecs_per_call: syscall_fields[2].parse().ok(),
-          calls: syscall_fields[3].parse().unwrap_or(0),
-          errors: if len < 6 {
+    if (5..=6).contains(&len) {
+      summary.insert(
+        syscall_name.to_string(),
+        StraceOutput {
+          percent_time: str::parse::<f64>(syscall_fields[0]).unwrap(),
+          seconds: str::parse::<f64>(syscall_fields[1]).unwrap(),
+          usecs_per_call: Some(str::parse::<u64>(syscall_fields[2]).unwrap()),
+          calls: str::parse::<u64>(syscall_fields[3]).unwrap(),
+          errors: if syscall_fields.len() < 6 {
             0
           } else {
-            syscall_fields[4].parse().unwrap_or(0)
+            str::parse::<u64>(syscall_fields[4]).unwrap()
           },
-        };
-        summary.insert(syscall_name.to_string(), output);
-      }
+        },
+      );
     }
   }
 
-  let total_fields: Vec<&str> = total_line.split_whitespace().collect();
-  let total = match total_fields.len() {
-    5 => StraceOutput {
-      percent_time: total_fields[0].parse().unwrap_or(0.0),
-      seconds: total_fields[1].parse().unwrap_or(0.0),
-      usecs_per_call: None,
-      calls: total_fields[2].parse().unwrap_or(0),
-      errors: total_fields[3].parse().unwrap_or(0),
-    },
-    6 => StraceOutput {
-      percent_time: total_fields[0].parse().unwrap_or(0.0),
-      seconds: total_fields[1].parse().unwrap_or(0.0),
-      usecs_per_call: total_fields[2].parse().ok(),
-      calls: total_fields[3].parse().unwrap_or(0),
-      errors: total_fields[4].parse().unwrap_or(0),
-    },
-    _ => {
-      panic!("Unexpected total field count: {}", total_fields.len());
-    }
-  };
+  let total_fields = total_line.split_whitespace().collect::<Vec<_>>();
+
+  summary.insert(
+    "total".to_string(),
+    match total_fields.len() {
+      // Old format, has no usecs/call
+      5 => StraceOutput {
+        percent_time: str::parse::<f64>(total_fields[0]).unwrap(),
+        seconds: str::parse::<f64>(total_fields[1]).unwrap(),
+        usecs_per_call: None,
+        calls: str::parse::<u64>(total_fields[2]).unwrap(),
+        errors: str::parse::<u64>(total_fields[3]).unwrap(),
+      },
+      6 => StraceOutput {
+        percent_time: str::parse::<f64>(total_fields[0]).unwrap(),
+        seconds: str::parse::<f64>(total_fields[1]).unwrap(),
+        usecs_per_call: Some(str::parse::<u64>(total_fields[2]).unwrap()),
+        calls: str::parse::<u64>(total_fields[3]).unwrap(),
+        errors: str::parse::<u64>(total_fields[4]).unwrap(),
+      },
+      _ => panic!("Unexpected total field count: {}", total_fields.len()),
+    },
+  );
 
-  summary.insert("total".to_string(), total);
   summary
 }
 
-/// Run a command and wait for completion.
-/// Returns an error if the command fails.
-pub fn run(cmd: &[&str]) -> Result<()> {
-  let status = Command::new(cmd[0])
-    .args(&cmd[1..])
-    .stdin(Stdio::piped())
-    .status()
-    .with_context(|| format!("failed to execute command: {cmd:?}"))?;
-
+#[allow(dead_code)]
+pub fn run(cmd: &[&str]) {
+  let mut process_builder = Command::new(cmd[0]);
+  process_builder.args(&cmd[1..]).stdin(Stdio::piped());
+  let mut prog = process_builder.spawn().expect("failed to spawn script");
+  let status = prog.wait().expect("failed to wait on child");
   if !status.success() {
-    bail!("Command {:?} exited with {:?}", cmd, status.code());
+    panic!("Unexpected exit code: {:?}", status.code());
   }
-  Ok(())
 }
 
-/// Read a JSON file into a [`serde_json::Value`].
+#[allow(dead_code)]
 pub fn read_json(filename: &str) -> Result<Value> {
-  let f =
-    fs::File::open(filename).with_context(|| format!("failed to open JSON file {filename}"))?;
+  let f = fs::File::open(filename)?;
   Ok(serde_json::from_reader(f)?)
 }
 
-/// Write a [`serde_json::Value`] into a JSON file.
+#[allow(dead_code)]
 pub fn write_json(filename: &str, value: &Value) -> Result<()> {
-  let f =
-    fs::File::create(filename).with_context(|| format!("failed to create JSON file {filename}"))?;
+  let f = fs::File::create(filename)?;
   serde_json::to_writer(f, value)?;
   Ok(())
 }
 
-/// Download a file from either a local path or an HTTP/HTTPS URL.
-/// Falls back to copying the file if the URL does not start with http/https.
-pub fn download_file(url: &str, filename: PathBuf) -> Result<()> {
+#[allow(dead_code)]
+pub fn download_file(url: &str, filename: PathBuf) {
   if !url.starts_with("http:") && !url.starts_with("https:") {
-    fs::copy(url, &filename).with_context(|| format!("failed to copy from {url}"))?;
-    return Ok(());
+    fs::copy(url, filename).unwrap();
+    return;
   }
 
-  println!("Downloading {url}");
+  // Downloading with curl this saves us from adding
+  // a Rust HTTP client dependency.
+  println!("Downloading {}", url);
   let status = Command::new("curl")
     .arg("-L")
     .arg("-s")
@@ -262,14 +238,8 @@ pub fn download_file(url: &str, filename: PathBuf) -> Result<()> {
     .arg(&filename)
     .arg(url)
     .status()
-    .with_context(|| format!("failed to execute curl for {url}"))?;
+    .unwrap();
 
-  if !status.success() {
-    bail!("curl failed with exit code {:?}", status.code());
-  }
-  if !filename.exists() {
-    bail!("expected file {:?} to exist after download", filename);
-  }
-
-  Ok(())
+  assert!(status.success());
+  assert!(filename.exists());
 }

bench/tests/cpu_intensive/public/index.css

@@ -1,7 +1,6 @@
 body {
-  font-family:
-    -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial,
-    sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica,
+    Arial, sans-serif;
   margin: auto;
   max-width: 38rem;
   padding: 2rem;

bench/tests/cpu_intensive/src-tauri/Cargo.toml

@@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [
 ] }
 
 [dependencies]
-serde_json = "1"
-serde = { version = "1", features = ["derive"] }
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../crates/tauri", features = [] }

bench/tests/files_transfer/src-tauri/Cargo.toml

@@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [
 ] }
 
 [dependencies]
-serde_json = "1"
-serde = { version = "1", features = ["derive"] }
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../crates/tauri", features = [] }

bench/tests/files_transfer/src-tauri/src/main.rs

@@ -18,7 +18,7 @@ async fn read_file<R: Runtime>(app: AppHandle<R>) -> Result<Response, String> {
     .path()
     .resolve(".tauri_3mb.json", BaseDirectory::Home)
     .map_err(|e| e.to_string())?;
-  let contents = read(path).map_err(|e| e.to_string())?;
+  let contents = read(&path).map_err(|e| e.to_string())?;
   Ok(Response::new(contents))
 }
 

bench/tests/helloworld/src-tauri/Cargo.toml

@@ -11,6 +11,6 @@ tauri-build = { path = "../../../../crates/tauri-build", features = [
 ] }
 
 [dependencies]
-serde_json = "1"
-serde = { version = "1", features = ["derive"] }
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
 tauri = { path = "../../../../crates/tauri", features = [] }

crates/tauri-build/CHANGELOG.md

@@ -1,137 +1,5 @@
 # Changelog
 
-## \[2.5.3]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.8.1`
-- Upgraded to `tauri-codegen@2.5.2`
-
-## \[2.5.2]
-
-### Dependencies
-
-- Upgraded to `tauri-codegen@2.5.1`
-
-## \[2.5.1]
-
-### Bug Fixes
-
-- [`4b6b8690a`](https://www.github.com/tauri-apps/tauri/commit/4b6b8690ab886ebdf1307951cffbe03e31280baa) ([#14347](https://www.github.com/tauri-apps/tauri/pull/14347) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
-
-## \[2.5.0]
-
-### New Features
-
-- [`3b4fac201`](https://www.github.com/tauri-apps/tauri/commit/3b4fac2017832d426dd07c5e24e26684eda57f7b) ([#14194](https://www.github.com/tauri-apps/tauri/pull/14194)) Add `tauri.conf.json > bundle > android > autoIncrementVersionCode` config option to automatically increment the Android version code.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.8.0`
-- Upgraded to `tauri-codegen@2.5.0`
-
-## \[2.4.1]
-
-### Enhancements
-
-- [`c23bec62d`](https://www.github.com/tauri-apps/tauri/commit/c23bec62d6d5724798869681aa1534423aae28e2) ([#14083](https://www.github.com/tauri-apps/tauri/pull/14083) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Tauri now ignores `macOS.minimumSystemVersion` in `tauri dev` to prevent forced rebuilds of macOS specific dependencies when using something like `rust-analyzer` at the same time as `tauri dev`.
-
-## \[2.4.0]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.7.0`
-- Upgraded to `tauri-codegen@2.4.0`
-
-## \[2.3.1]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.6.0`
-- Upgraded to `tauri-codegen@2.3.1`
-
-## \[2.2.1]
-
-### Dependencies
-
-- Upgraded to `tauri-codegen@2.3.0`
-- Upgraded to `tauri-utils@2.5.0`
-
-## \[2.2.0]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.4.0`
-- Upgraded to `tauri-codegen@2.2.0`
-- [`48b12b440`](https://www.github.com/tauri-apps/tauri/commit/48b12b440478937c46fdfef9f9d95194be117020) Update to `tauri-utils@2.4.0`
-
-## \[2.1.1]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.3.1`
-- Upgraded to `tauri-codegen@2.1.1`
-
-## \[2.1.0]
-
-### New Features
-
-- [`013f8f652`](https://www.github.com/tauri-apps/tauri/commit/013f8f652302f2d49c5ec0a075582033d8b074fb) ([#12890](https://www.github.com/tauri-apps/tauri/pull/12890) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Added `build > removeUnusedCommands` to trigger the build scripts and macros to remove unused commands based on the capabilities you defined. Note this won't be accounting for dynamically added ACLs so make sure to check it when using this.
-
-### Performance Improvements
-
-- [`1cd8f55ee`](https://www.github.com/tauri-apps/tauri/commit/1cd8f55eed326d61860fee62ba2d2f4464bdcfcc) ([#13033](https://www.github.com/tauri-apps/tauri/pull/13033) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Don't ship global `bundle.global.js` if `app > withGlobalTauri` is set to false
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.3.0`
-- Upgraded to `tauri-codegen@2.1.0`
-
-## \[2.0.6]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.2.0`
-- Upgraded to `tauri-codegen@2.0.5`
-
-## \[2.0.5]
-
-### Bug Fixes
-
-- [`848d0e060`](https://www.github.com/tauri-apps/tauri/commit/848d0e060e6eb3c8e9e8175adc7896587b5a947d) ([#12270](https://www.github.com/tauri-apps/tauri/pull/12270) by [@aurelj](https://www.github.com/tauri-apps/tauri/../../aurelj)) Update `cargo_toml` to `0.21.0`. This adds compatibility with Rust's 2024 Edition.
-- [`cd1d026f9`](https://www.github.com/tauri-apps/tauri/commit/cd1d026f9799c26b04acb64f49e7ee0a8b193049) ([#11961](https://www.github.com/tauri-apps/tauri/pull/11961) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix tauri fails to build if the project path contains glob characters
-
-## \[2.0.4]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.1.1`
-- Upgraded to `tauri-codegen@2.0.4`
-
-## \[2.0.3]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.1.0`
-- Upgraded to `tauri-codegen@2.0.3`
-
-## \[2.0.2]
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.0.2`
-
-## \[2.0.1]
-
-### What's Changed
-
-- [`0ab2b3306`](https://www.github.com/tauri-apps/tauri/commit/0ab2b330644b6419f6cee1d5377bfb5cdda2ccf9) ([#11205](https://www.github.com/tauri-apps/tauri/pull/11205) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.0.1`
-- Upgraded to `tauri-codegen@2.0.1`
-
 ## \[2.0.0]
 
 ### What's Changed

crates/tauri-build/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-build"
-version = "2.5.3"
+version = "2.0.0"
 description = "build time code to pair with https://crates.io/crates/tauri"
 exclude = ["CHANGELOG.md", "/target"]
 readme = "README.md"
@@ -22,28 +22,29 @@ targets = [
   "x86_64-linux-android",
   "x86_64-apple-ios",
 ]
+rustc-args = ["--cfg", "docsrs"]
+rustdoc-args = ["--cfg", "docsrs"]
 
 [dependencies]
 anyhow = "1"
 quote = { version = "1", optional = true }
-tauri-codegen = { version = "2.5.2", path = "../tauri-codegen", optional = true }
-tauri-utils = { version = "2.8.1", path = "../tauri-utils", features = [
+tauri-codegen = { version = "2.0.0", path = "../tauri-codegen", optional = true }
+tauri-utils = { version = "2.0.0", path = "../tauri-utils", features = [
   "build",
   "resources",
 ] }
-cargo_toml = "0.22"
+cargo_toml = "0.17"
 serde = "1"
 serde_json = "1"
 heck = "0.5"
-json-patch = "3"
+json-patch = "2.0"
 walkdir = "2"
-tauri-winres = "0.3"
+tauri-winres = "0.1"
 semver = "1"
-dirs = "6"
+dirs = "5"
 glob = "0.3"
-toml = "0.9"
-# Our code requires at least 0.8.21 so don't simplify this to 0.8
-schemars = { version = "0.8.21", features = ["preserve_order"] }
+toml = "0.8"
+schemars = { version = "0.8.18", features = ["preserve_order"] }
 
 [features]
 default = ["config-json"]

crates/tauri-build/src/acl.rs

@@ -11,9 +11,7 @@ use std::{
 use anyhow::{Context, Result};
 use tauri_utils::{
   acl::{
-    capability::Capability,
-    manifest::{Manifest, PermissionFile},
-    schema::CAPABILITIES_SCHEMA_FOLDER_PATH,
+    capability::Capability, manifest::Manifest, schema::CAPABILITIES_SCHEMA_FOLDER_PATH,
     ACL_MANIFESTS_FILE_NAME, APP_ACL_KEY, CAPABILITIES_FILE_NAME,
   },
   platform::Target,
@@ -157,17 +155,11 @@ fn read_plugins_manifests() -> Result<BTreeMap<String, Manifest>> {
   Ok(manifests)
 }
 
-struct InlinedPluginsAcl {
-  manifests: BTreeMap<String, Manifest>,
-  permission_files: BTreeMap<String, Vec<PermissionFile>>,
-}
-
 fn inline_plugins(
   out_dir: &Path,
   inlined_plugins: HashMap<&'static str, InlinedPlugin>,
-) -> Result<InlinedPluginsAcl> {
+) -> Result<BTreeMap<String, Manifest>> {
   let mut acl_manifests = BTreeMap::new();
-  let mut permission_files_map = BTreeMap::new();
 
   for (name, plugin) in inlined_plugins {
     let plugin_out_dir = out_dir.join("plugins").join(name);
@@ -207,9 +199,7 @@ permissions = [{default_permissions}]
       }
 
       tauri_utils::acl::build::define_permissions(
-        &PathBuf::from(glob::Pattern::escape(&plugin_out_dir.to_string_lossy()))
-          .join("*")
-          .to_string_lossy(),
+        &plugin_out_dir.join("*").to_string_lossy(),
         name,
         &plugin_out_dir,
         |_| true,
@@ -232,41 +222,28 @@ permissions = [{default_permissions}]
         );
       }
       permission_files.extend(tauri_utils::acl::build::define_permissions(
-        &PathBuf::from(glob::Pattern::escape(
-          &default_permissions_path.to_string_lossy(),
-        ))
-        .join("**")
-        .join("*")
-        .to_string_lossy(),
+        &default_permissions_path
+          .join("**")
+          .join("*")
+          .to_string_lossy(),
         name,
         &plugin_out_dir,
         |_| true,
       )?);
     }
 
-    permission_files_map.insert(name.into(), permission_files.clone());
-
     let manifest = tauri_utils::acl::manifest::Manifest::new(permission_files, None);
     acl_manifests.insert(name.into(), manifest);
   }
 
-  Ok(InlinedPluginsAcl {
-    manifests: acl_manifests,
-    permission_files: permission_files_map,
-  })
-}
-
-#[derive(Debug)]
-struct AppManifestAcl {
-  manifest: Manifest,
-  permission_files: Vec<PermissionFile>,
+  Ok(acl_manifests)
 }
 
 fn app_manifest_permissions(
   out_dir: &Path,
   manifest: AppManifest,
   inlined_plugins: &HashMap<&'static str, InlinedPlugin>,
-) -> Result<AppManifestAcl> {
+) -> Result<Manifest> {
   let app_out_dir = out_dir.join("app-manifest");
   fs::create_dir_all(&app_out_dir)?;
   let pkg_name = "__app__";
@@ -309,7 +286,6 @@ fn app_manifest_permissions(
     let inlined_plugins_permissions: Vec<_> = inlined_plugins
       .keys()
       .map(|name| permissions_root.join(name))
-      .flat_map(|p| p.canonicalize())
       .collect();
 
     permission_files.extend(tauri_utils::acl::build::define_permissions(
@@ -328,10 +304,10 @@ fn app_manifest_permissions(
     )?);
   }
 
-  Ok(AppManifestAcl {
-    permission_files: permission_files.clone(),
-    manifest: tauri_utils::acl::manifest::Manifest::new(permission_files, None),
-  })
+  Ok(tauri_utils::acl::manifest::Manifest::new(
+    permission_files,
+    None,
+  ))
 }
 
 fn validate_capabilities(
@@ -400,21 +376,19 @@ fn validate_capabilities(
 pub fn build(out_dir: &Path, target: Target, attributes: &Attributes) -> super::Result<()> {
   let mut acl_manifests = read_plugins_manifests()?;
 
-  let app_acl = app_manifest_permissions(
+  let app_manifest = app_manifest_permissions(
     out_dir,
     attributes.app_manifest,
     &attributes.inlined_plugins,
   )?;
-  let has_app_manifest = app_acl.manifest.default_permission.is_some()
-    || !app_acl.manifest.permission_sets.is_empty()
-    || !app_acl.manifest.permissions.is_empty();
-  if has_app_manifest {
-    acl_manifests.insert(APP_ACL_KEY.into(), app_acl.manifest);
+  if app_manifest.default_permission.is_some()
+    || !app_manifest.permission_sets.is_empty()
+    || !app_manifest.permissions.is_empty()
+  {
+    acl_manifests.insert(APP_ACL_KEY.into(), app_manifest);
   }
 
-  let inline_plugins_acl = inline_plugins(out_dir, attributes.inlined_plugins.clone())?;
-
-  acl_manifests.extend(inline_plugins_acl.manifests);
+  acl_manifests.extend(inline_plugins(out_dir, attributes.inlined_plugins.clone())?);
 
   let acl_manifests_path = save_acl_manifests(&acl_manifests)?;
   fs::copy(acl_manifests_path, out_dir.join(ACL_MANIFESTS_FILE_NAME))?;
@@ -432,12 +406,7 @@ pub fn build(out_dir: &Path, target: Target, attributes: &Attributes) -> super::
   let capabilities_path = save_capabilities(&capabilities)?;
   fs::copy(capabilities_path, out_dir.join(CAPABILITIES_FILE_NAME))?;
 
-  let mut permissions_map = inline_plugins_acl.permission_files;
-  if has_app_manifest {
-    permissions_map.insert(APP_ACL_KEY.to_string(), app_acl.permission_files);
-  }
-
-  tauri_utils::acl::build::generate_allowed_commands(out_dir, Some(capabilities), permissions_map)?;
+  tauri_utils::plugin::save_global_api_scripts_paths(out_dir);
 
   Ok(())
 }

crates/tauri-build/src/codegen/context.rs

@@ -120,13 +120,6 @@ impl CodegenContext {
       if info_plist_path.exists() {
         println!("cargo:rerun-if-changed={}", info_plist_path.display());
       }
-
-      if let Some(plist_path) = &config.bundle.macos.info_plist {
-        let info_plist_path = config_parent.join(plist_path);
-        if info_plist_path.exists() {
-          println!("cargo:rerun-if-changed={}", info_plist_path.display());
-        }
-      }
     }
 
     let code = context_codegen(ContextData {

crates/tauri-build/src/lib.rs

@@ -2,6 +2,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+//! [![](https://github.com/tauri-apps/tauri/raw/dev/.github/splash.png)](https://tauri.app)
+//!
 //! This applies the macros at build-time in order to rig some special features needed by `cargo`.
 
 #![doc(
@@ -68,7 +70,7 @@ fn copy_binaries(
       .to_string_lossy()
       .replace(&format!("-{target_triple}"), "");
 
-    if package_name == Some(&file_name) {
+    if package_name.map_or(false, |n| n == &file_name) {
       return Err(anyhow::anyhow!(
         "Cannot define a sidecar with the same name as the Cargo package name `{}`. Please change the sidecar name in the filesystem and the Tauri configuration.",
         file_name
@@ -165,21 +167,21 @@ fn copy_frameworks(dest_dir: &Path, frameworks: &[String]) -> Result<()> {
     .with_context(|| format!("Failed to create frameworks output directory at {dest_dir:?}"))?;
   for framework in frameworks.iter() {
     if framework.ends_with(".framework") {
-      let src_path = Path::new(framework);
+      let src_path = PathBuf::from(framework);
       let src_name = src_path
         .file_name()
         .expect("Couldn't get framework filename");
       let dest_path = dest_dir.join(src_name);
-      copy_dir(src_path, &dest_path)?;
+      copy_dir(&src_path, &dest_path)?;
       continue;
     } else if framework.ends_with(".dylib") {
-      let src_path = Path::new(framework);
+      let src_path = PathBuf::from(framework);
       if !src_path.exists() {
         return Err(anyhow::anyhow!("Library not found: {}", framework));
       }
       let src_name = src_path.file_name().expect("Couldn't get library filename");
       let dest_path = dest_dir.join(src_name);
-      copy_file(src_path, &dest_path)?;
+      copy_file(&src_path, &dest_path)?;
       continue;
     } else if framework.contains('/') {
       return Err(anyhow::anyhow!(
@@ -192,8 +194,12 @@ fn copy_frameworks(dest_dir: &Path, frameworks: &[String]) -> Result<()> {
         continue;
       }
     }
-    if copy_framework_from("/Library/Frameworks/".as_ref(), framework, dest_dir)?
-      || copy_framework_from("/Network/Library/Frameworks/".as_ref(), framework, dest_dir)?
+    if copy_framework_from(&PathBuf::from("/Library/Frameworks/"), framework, dest_dir)?
+      || copy_framework_from(
+        &PathBuf::from("/Network/Library/Frameworks/"),
+        framework,
+        dest_dir,
+      )?
     {
       continue;
     }
@@ -259,7 +265,7 @@ impl WindowsAttributes {
     }
   }
 
-  /// Creates the default attribute set without the default app manifest.
+  /// Creates the default attriute set wihtou the default app manifest.
   #[must_use]
   pub fn new_without_app_manifest() -> Self {
     Self {
@@ -363,8 +369,6 @@ impl Attributes {
 
   /// Set the glob pattern to be used to find the capabilities.
   ///
-  /// **WARNING:** The `removeUnusedCommands` option does not work with a custom capabilities path.
-  ///
   /// **Note:** You must emit [rerun-if-changed] instructions for your capabilities directory.
   ///
   /// [rerun-if-changed]: https://doc.rust-lang.org/cargo/reference/build-scripts.html#rerun-if-changed
@@ -417,26 +421,23 @@ pub fn is_dev() -> bool {
 
 /// Run all build time helpers for your Tauri Application.
 ///
-/// To provide extra configuration, such as [`AppManifest::commands`]
-/// for fine-grained control over command permissions, see [`try_build`].
-/// See [`Attributes`] for the complete list of configuration options.
+/// The current helpers include the following:
+/// * Generates a Windows Resource file when targeting Windows.
 ///
 /// # Platforms
 ///
-/// [`build()`] should be called inside of `build.rs` regardless of the platform, so **DO NOT** use a [conditional compilation]
-/// check that prevents it from running on any of your targets.
+/// [`build()`] should be called inside of `build.rs` regardless of the platform:
+/// * New helpers may target more platforms in the future.
+/// * Platform specific code is handled by the helpers automatically.
+/// * A build script is required in order to activate some cargo environmental variables that are
+///   used when generating code and embedding assets - so [`build()`] may as well be called.
 ///
-/// Platform specific code is handled by the helpers automatically.
-///
-/// A build script is required in order to activate some cargo environmental variables that are
-/// used when generating code and embedding assets.
+/// In short, this is saying don't put the call to [`build()`] behind a `#[cfg(windows)]`.
 ///
 /// # Panics
 ///
 /// If any of the build time helpers fail, they will [`std::panic!`] with the related error message.
 /// This is typically desirable when running inside a build script; see [`try_build`] for no panics.
-///
-/// [conditional compilation]: https://web.mit.edu/rust-lang_v1.25/arch/amd64_ubuntu1404/share/doc/rust/html/book/first-edition/conditional-compilation.html
 pub fn build() {
   if let Err(error) = try_build(Attributes::default()) {
     let error = format!("{error:#}");
@@ -451,12 +452,18 @@ pub fn build() {
   }
 }
 
-/// Same as [`build()`], but takes an extra configuration argument, and does not panic.
+/// Non-panicking [`build()`].
 #[allow(unused_variables)]
 pub fn try_build(attributes: Attributes) -> Result<()> {
   use anyhow::anyhow;
 
   println!("cargo:rerun-if-env-changed=TAURI_CONFIG");
+  #[cfg(feature = "config-json")]
+  println!("cargo:rerun-if-changed=tauri.conf.json");
+  #[cfg(feature = "config-json5")]
+  println!("cargo:rerun-if-changed=tauri.conf.json5");
+  #[cfg(feature = "config-toml")]
+  println!("cargo:rerun-if-changed=Tauri.toml");
 
   let target_os = env::var("CARGO_CFG_TARGET_OS").unwrap();
   let mobile = target_os == "ios" || target_os == "android";
@@ -466,11 +473,12 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
   let target_triple = env::var("TARGET").unwrap();
   let target = tauri_utils::platform::Target::from_triple(&target_triple);
 
-  let (mut config, config_paths) =
-    tauri_utils::config::parse::read_from(target, &env::current_dir().unwrap())?;
-  for config_file_path in config_paths {
-    println!("cargo:rerun-if-changed={}", config_file_path.display());
+  let (config, merged_config_path) =
+    tauri_utils::config::parse::read_from(target, env::current_dir().unwrap())?;
+  if let Some(merged_config_path) = merged_config_path {
+    println!("cargo:rerun-if-changed={}", merged_config_path.display());
   }
+  let mut config = serde_json::from_value(config)?;
   if let Ok(env) = env::var("TAURI_CONFIG") {
     let merge_config: serde_json::Value = serde_json::from_str(&env)?;
     json_patch::merge(&mut config, &merge_config);
@@ -495,13 +503,24 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
   println!("cargo:rustc-env=TAURI_ANDROID_PACKAGE_NAME_PREFIX={android_package_prefix}");
 
   if let Some(project_dir) = env::var_os("TAURI_ANDROID_PROJECT_PATH").map(PathBuf::from) {
-    mobile::generate_gradle_files(project_dir)?;
+    mobile::generate_gradle_files(project_dir, &config)?;
   }
 
   cfg_alias("dev", is_dev());
 
-  let cargo_toml_path = Path::new("Cargo.toml").canonicalize()?;
-  let mut manifest = Manifest::<cargo_toml::Value>::from_path_with_metadata(cargo_toml_path)?;
+  let ws_path = get_workspace_dir()?;
+  let mut manifest =
+    Manifest::<cargo_toml::Value>::from_slice_with_metadata(&fs::read("Cargo.toml")?)?;
+
+  if let Ok(ws_manifest) = Manifest::from_path(ws_path.join("Cargo.toml")) {
+    Manifest::complete_from_path_and_workspace(
+      &mut manifest,
+      Path::new("Cargo.toml"),
+      Some((&ws_manifest, ws_path.as_path())),
+    )?;
+  } else {
+    Manifest::complete_from_path(&mut manifest, Path::new("Cargo.toml"))?;
+  }
 
   let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
 
@@ -509,8 +528,6 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
   acl::build(&out_dir, target, &attributes)?;
 
-  tauri_utils::plugin::save_global_api_scripts_paths(&out_dir, None);
-
   println!("cargo:rustc-env=TAURI_ENV_TARGET_TRIPLE={target_triple}");
   // when running codegen in this build script, we need to access the env var directly
   env::set_var("TAURI_ENV_TARGET_TRIPLE", &target_triple);
@@ -526,7 +543,7 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
   if let Some(paths) = &config.bundle.external_bin {
     copy_binaries(
-      ResourcePaths::new(&external_binaries(paths, &target_triple, &target), true),
+      ResourcePaths::new(external_binaries(paths, &target_triple).as_slice(), true),
       &target_triple,
       target_dir,
       manifest.package.as_ref().map(|p| &p.name),
@@ -569,10 +586,8 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
       }
     }
 
-    if !is_dev() {
-      if let Some(version) = &config.bundle.macos.minimum_system_version {
-        println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET={version}");
-      }
+    if let Some(version) = &config.bundle.macos.minimum_system_version {
+      println!("cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET={version}");
     }
   }
 
@@ -611,7 +626,7 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
     if let Some(version_str) = &config.version {
       if let Ok(v) = Version::parse(version_str) {
-        let version = (v.major << 48) | (v.minor << 32) | (v.patch << 16);
+        let version = v.major << 48 | v.minor << 32 | v.patch << 16;
         res.set_version_info(VersionInfo::FILEVERSION, version);
         res.set_version_info(VersionInfo::PRODUCTVERSION, version);
       }
@@ -621,17 +636,6 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
       res.set("ProductName", product_name);
     }
 
-    let company_name = config.bundle.publisher.unwrap_or_else(|| {
-      config
-        .identifier
-        .split('.')
-        .nth(1)
-        .unwrap_or(&config.identifier)
-        .to_string()
-    });
-
-    res.set("CompanyName", &company_name);
-
     let file_description = config
       .product_name
       .or_else(|| manifest.package.as_ref().map(|p| p.name.clone()))
@@ -684,7 +688,7 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
         }
       }
       "msvc" => {
-        if env::var("STATIC_VCRUNTIME").is_ok_and(|v| v == "true") {
+        if env::var("STATIC_VCRUNTIME").map_or(false, |v| v == "true") {
           static_vcruntime::build();
         }
       }
@@ -699,3 +703,23 @@ pub fn try_build(attributes: Attributes) -> Result<()> {
 
   Ok(())
 }
+
+#[derive(serde::Deserialize)]
+struct CargoMetadata {
+  workspace_root: PathBuf,
+}
+
+fn get_workspace_dir() -> Result<PathBuf> {
+  let output = std::process::Command::new("cargo")
+    .args(["metadata", "--no-deps", "--format-version", "1"])
+    .output()?;
+
+  if !output.status.success() {
+    return Err(anyhow::anyhow!(
+      "cargo metadata command exited with a non zero exit code: {}",
+      String::from_utf8(output.stderr)?
+    ));
+  }
+
+  Ok(serde_json::from_slice::<CargoMetadata>(&output.stdout)?.workspace_root)
+}

crates/tauri-build/src/mobile.rs

@@ -2,14 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use std::path::PathBuf;
+use std::{fs::write, path::PathBuf};
 
 use anyhow::{Context, Result};
-use tauri_utils::write_if_changed;
+use semver::Version;
+use tauri_utils::{config::Config, write_if_changed};
 
-pub fn generate_gradle_files(project_dir: PathBuf) -> Result<()> {
+use crate::is_dev;
+
+pub fn generate_gradle_files(project_dir: PathBuf, config: &Config) -> Result<()> {
   let gradle_settings_path = project_dir.join("tauri.settings.gradle");
   let app_build_gradle_path = project_dir.join("app").join("tauri.build.gradle.kts");
+  let app_tauri_properties_path = project_dir.join("app").join("tauri.properties");
 
   let mut gradle_settings =
     "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n".to_string();
@@ -17,6 +21,7 @@ pub fn generate_gradle_files(project_dir: PathBuf) -> Result<()> {
 val implementation by configurations
 dependencies {"
     .to_string();
+  let mut app_tauri_properties = Vec::new();
 
   for (env, value) in std::env::vars_os() {
     let env = env.to_string_lossy();
@@ -49,6 +54,32 @@ dependencies {"
 
   app_build_gradle.push_str("\n}");
 
+  if let Some(version) = config.version.as_ref() {
+    app_tauri_properties.push(format!("tauri.android.versionName={version}"));
+    if let Some(version_code) = config.bundle.android.version_code.as_ref() {
+      app_tauri_properties.push(format!("tauri.android.versionCode={version_code}"));
+    } else if let Ok(version) = Version::parse(version) {
+      let mut version_code = version.major * 1000000 + version.minor * 1000 + version.patch;
+
+      if is_dev() {
+        version_code = version_code.clamp(1, 2100000000);
+      }
+
+      if version_code == 0 {
+        return Err(anyhow::anyhow!(
+              "You must change the `version` in `tauri.conf.json`. The default value `0.0.0` is not allowed for Android package and must be at least `0.0.1`."
+            ));
+      } else if version_code > 2100000000 {
+        return Err(anyhow::anyhow!(
+          "Invalid version code {}. Version code must be between 1 and 2100000000. You must change the `version` in `tauri.conf.json`.",
+          version_code
+        ));
+      }
+
+      app_tauri_properties.push(format!("tauri.android.versionCode={version_code}"));
+    }
+  }
+
   // Overwrite only if changed to not trigger rebuilds
   write_if_changed(&gradle_settings_path, gradle_settings)
     .context("failed to write tauri.settings.gradle")?;
@@ -56,8 +87,28 @@ dependencies {"
   write_if_changed(&app_build_gradle_path, app_build_gradle)
     .context("failed to write tauri.build.gradle.kts")?;
 
+  if !app_tauri_properties.is_empty() {
+    let app_tauri_properties_content = format!(
+      "// THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.\n{}",
+      app_tauri_properties.join("\n")
+    );
+    if std::fs::read_to_string(&app_tauri_properties_path)
+      .map(|o| o != app_tauri_properties_content)
+      .unwrap_or(true)
+    {
+      write(&app_tauri_properties_path, app_tauri_properties_content)
+        .context("failed to write tauri.properties")?;
+    }
+  }
+
   println!("cargo:rerun-if-changed={}", gradle_settings_path.display());
   println!("cargo:rerun-if-changed={}", app_build_gradle_path.display());
+  if !app_tauri_properties.is_empty() {
+    println!(
+      "cargo:rerun-if-changed={}",
+      app_tauri_properties_path.display()
+    );
+  }
 
   Ok(())
 }

crates/tauri-bundler/CHANGELOG.md

@@ -1,295 +1,5 @@
 # Changelog
 
-## \[2.7.5]
-
-### Enhancements
-
-- [`4176f93ae`](https://www.github.com/tauri-apps/tauri/commit/4176f93ae43ef66714c4934feb3df19df3a3e28a) ([#14570](https://www.github.com/tauri-apps/tauri/pull/14570) by [@chfaft](https://www.github.com/tauri-apps/tauri/../../chfaft)) Consider extensions that are defined in the wxs template.
-
-### Bug Fixes
-
-- [`018b4db22`](https://www.github.com/tauri-apps/tauri/commit/018b4db22e167fa67b37b0933e192a0f3556d3e5) ([#14625](https://www.github.com/tauri-apps/tauri/pull/14625) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Skip signing for NSIS uninstaller when using `--no-sign` flag
-- [`91becd9e4`](https://www.github.com/tauri-apps/tauri/commit/91becd9e4fa2db089ddc6b21dadc06133e939e08) ([#14627](https://www.github.com/tauri-apps/tauri/pull/14627) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix NSIS plugins not being signed due to wrong path handlings
-
-### Dependencies
-
-- Upgraded to `tauri-macos-sign@2.3.2`
-
-## \[2.7.4]
-
-### Bug Fixes
-
-- [`1496145f8`](https://www.github.com/tauri-apps/tauri/commit/1496145f8222649efeff22b819a96208670bbea1) ([#14585](https://www.github.com/tauri-apps/tauri/pull/14585) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused the AppImage bundler to fail with 404 errors for 32-bit builds.
-
-### Performance Improvements
-
-- [`ce98d87ce`](https://www.github.com/tauri-apps/tauri/commit/ce98d87ce0aaa907285852eb80691197424e03c3) ([#14474](https://www.github.com/tauri-apps/tauri/pull/14474) by [@Tunglies](https://www.github.com/tauri-apps/tauri/../../Tunglies)) refactor: remove needless collect. No user facing changes.
-- [`ee3cc4a91`](https://www.github.com/tauri-apps/tauri/commit/ee3cc4a91bf1315ecaefe90f423ffd55ef6c40db) ([#14475](https://www.github.com/tauri-apps/tauri/pull/14475) by [@Tunglies](https://www.github.com/tauri-apps/tauri/../../Tunglies)) perf: remove needless clones in various files for improved performance. No user facing changes.
-
-### Dependencies
-
-- Upgraded to `tauri-macos-sign@2.3.1`
-- Upgraded to `tauri-utils@2.8.1`
-- [`b5ef603d8`](https://www.github.com/tauri-apps/tauri/commit/b5ef603d84bd8044625e50dcfdabb099b2e9fdd9) ([#14478](https://www.github.com/tauri-apps/tauri/pull/14478) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Updated NSIS from 3.8 to 3.11
-
-## \[2.7.3]
-
-### Enhancements
-
-- [`22edc65aa`](https://www.github.com/tauri-apps/tauri/commit/22edc65aad0b3e45515008e8e0866112da70c8a1) ([#14408](https://www.github.com/tauri-apps/tauri/pull/14408) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Set user-agent in bundler and cli http requests when fetching build tools.
-
-### Bug Fixes
-
-- [`9a1922636`](https://www.github.com/tauri-apps/tauri/commit/9a192263693d71123a9953e2a6ee60fad07500b4) ([#14410](https://www.github.com/tauri-apps/tauri/pull/14410) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix uninstall fails if you close the app manually during the 'Click Ok to kill it' dialog
-
-## \[2.7.2]
-
-### Enhancements
-
-- [`7f710b8f3`](https://www.github.com/tauri-apps/tauri/commit/7f710b8f3b509ed327d76761926511cf56e66b2d) ([#14390](https://www.github.com/tauri-apps/tauri/pull/14390) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Inline linuxdeploy plugins which were previously downloaded from `https://raw.githubusercontent.com` which lately blocks many users with a 429 error.
-- [`fc017ee25`](https://www.github.com/tauri-apps/tauri/commit/fc017ee2577f48615367ea519386d3f37837e2c1) ([#14368](https://www.github.com/tauri-apps/tauri/pull/14368) by [@kandrelczyk](https://www.github.com/tauri-apps/tauri/../../kandrelczyk)) Mention symbol stripping on Linux in binary patch failed warning message
-
-## \[2.7.1]
-
-### Dependencies
-
-- Upgraded to `tauri-macos-sign@2.3.0`
-
-## \[2.7.0]
-
-### New Features
-
-- [`2a06d1006`](https://www.github.com/tauri-apps/tauri/commit/2a06d10066a806e392efe8bfb16d943ee0b0b61d) ([#14052](https://www.github.com/tauri-apps/tauri/pull/14052)) Add a `--no-sign` flag to the `tauri build` and `tauri bundle` commands to skip the code signing step, improving the developer experience for local testing and development without requiring code signing keys.
-- [`cc8c0b531`](https://www.github.com/tauri-apps/tauri/commit/cc8c0b53171173dbd1d01781a50de1a3ea159031) ([#14031](https://www.github.com/tauri-apps/tauri/pull/14031)) Support providing `plist::Value` as macOS entitlements.
-
-### Enhancements
-
-- [`b06b3bd09`](https://www.github.com/tauri-apps/tauri/commit/b06b3bd091b0fed26cdcfb23cacb0462a7a9cc2d) ([#14126](https://www.github.com/tauri-apps/tauri/pull/14126)) Improve error messages with more context.
-
-### Bug Fixes
-
-- [`06d4a4ed6`](https://www.github.com/tauri-apps/tauri/commit/06d4a4ed6c146d6c7782016cf90037b56b944445) ([#14241](https://www.github.com/tauri-apps/tauri/pull/14241)) Set `APPIMAGE_EXTRACT_AND_RUN` on top of using the `--appimage-extra-and-run` cli arg for linuxdeploy.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.8.0`
-
-### Breaking Changes
-
-- [`ed7c9a410`](https://www.github.com/tauri-apps/tauri/commit/ed7c9a4100e08c002212265549d12130d021ad1e) ([#14108](https://www.github.com/tauri-apps/tauri/pull/14108)) Changed `MacOsSettings::info_plist_path` to `MacOsSettings::info_plist`.
-
-## \[2.6.1]
-
-### Bug Fixes
-
-- [`f3df96fb3`](https://www.github.com/tauri-apps/tauri/commit/f3df96fb38e2f27ce6bf232fe87f35bcfec50ce4) ([#14065](https://www.github.com/tauri-apps/tauri/pull/14065) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix binary patching updater type fails on 32 bit Windows builds
-
-## \[2.6.0]
-
-### New Features
-
-- [`a9ec12843`](https://www.github.com/tauri-apps/tauri/commit/a9ec12843aa7d0eb774bd3a53e2e63da12cfa77b) ([#13521](https://www.github.com/tauri-apps/tauri/pull/13521) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Added a `--skip-stapling` option to make `tauri build|bundle` *not* wait for notarization to finish on macOS.
-
-### Enhancements
-
-- [`8b465a12b`](https://www.github.com/tauri-apps/tauri/commit/8b465a12ba73e94d7a3995defd9cc362d15eeebe) ([#13913](https://www.github.com/tauri-apps/tauri/pull/13913) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The bundler now pulls the latest AppImage linuxdeploy plugin instead of using the built-in one. This should remove the libfuse requirement.
-- [`4475e93e1`](https://www.github.com/tauri-apps/tauri/commit/4475e93e136e9e2bd5f3c7817fa2040924f630f6) ([#13824](https://www.github.com/tauri-apps/tauri/pull/13824) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The bundler and cli will now read TLS Certificates installed on the system when downloading tools and checking versions.
-
-### Bug Fixes
-
-- [`a8f1569b0`](https://www.github.com/tauri-apps/tauri/commit/a8f1569b04edf7b54a19e19ad37b421b0808f512) ([#13921](https://www.github.com/tauri-apps/tauri/pull/13921) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) The bundler will no longer try to sign non-binary and already signed binary files on Windows
-- [`bc6b125b2`](https://www.github.com/tauri-apps/tauri/commit/bc6b125b24589ffc412a4f17d899a387a0fc0bb2) ([#13909](https://www.github.com/tauri-apps/tauri/pull/13909) by [@Andrew15-5](https://www.github.com/tauri-apps/tauri/../../Andrew15-5)) The bundler now falls back to `1` for the release in case an empty string was provided instead of using `-.` in the file name.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.7.0`
-- Upgraded to `tauri-macos-sign@2.2.0`
-
-## \[2.5.2]
-
-### Bug Fixes
-
-- [`af95fb601`](https://www.github.com/tauri-apps/tauri/commit/af95fb6014ea54a2636bfd299095608f6cd93221) ([#13870](https://www.github.com/tauri-apps/tauri/pull/13870) by [@kittuov](https://www.github.com/tauri-apps/tauri/../../kittuov)) The bundler now signs the main binary after patching it for every package type on windows
-
-## \[2.5.1]
-
-### Bug Fixes
-
-- [`f94af9035`](https://www.github.com/tauri-apps/tauri/commit/f94af90359ec8b01138ae542391caa704ec18ca8) ([#13786](https://www.github.com/tauri-apps/tauri/pull/13786) by [@catalinsh](https://www.github.com/tauri-apps/tauri/../../catalinsh)) Fix NSIS per-machine installer not requesting elevation when run by non-admin users.
-- [`f2dbe7309`](https://www.github.com/tauri-apps/tauri/commit/f2dbe730979d570be3ee3ecac9621204c4ceb788) ([#13772](https://www.github.com/tauri-apps/tauri/pull/13772) by [@catalinsh](https://www.github.com/tauri-apps/tauri/../../catalinsh)) Fix incorrect expected file path for `nsis_tauri_utils.dll` resulting in tauri-cli re-downloading the file on every build.
-- [`7a6fd5b75`](https://www.github.com/tauri-apps/tauri/commit/7a6fd5b75d61071e2771f6277c0376ec206d302a) ([#13863](https://www.github.com/tauri-apps/tauri/pull/13863) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The AppImage bundler now pulls the AppRun binaries from our GitHub mirror, fixing 404 errors.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.6.0`
-
-## \[2.5.0]
-
-### New Features
-
-- [`414619c36`](https://www.github.com/tauri-apps/tauri/commit/414619c36e94e21939534dd72c0438b93da75546) ([#13536](https://www.github.com/tauri-apps/tauri/pull/13536) by [@Tunglies](https://www.github.com/tauri-apps/tauri/../../Tunglies)) Added support for the `bundleName` property in the macOS bundler configuration. This allows specifying the `CFBundleName` value for generated macOS bundles.
-- [`7322f0579`](https://www.github.com/tauri-apps/tauri/commit/7322f057923aaec88960ad5556776774b745762f) ([#13502](https://www.github.com/tauri-apps/tauri/pull/13502) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Allow using `CheckIfAppIsRunning` macro inside NSIS hooks, for example `!insertmacro CheckIfAppIsRunning "another-executable.exe" "Another Executable"`.
-
-### Bug Fixes
-
-- [`479cee3d3`](https://www.github.com/tauri-apps/tauri/commit/479cee3d3680f9020005bdfb380d3a9482e286a1) ([#13260](https://www.github.com/tauri-apps/tauri/pull/13260) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The bundler now sets the `ARCH` env var to the current build target to prevent potential issues with `appimagetool`'s auto-detection.
-- [`e045fe32c`](https://www.github.com/tauri-apps/tauri/commit/e045fe32c9b0bed954916dc42528e28ee19f75b8) ([#13334](https://www.github.com/tauri-apps/tauri/pull/13334) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Fix custom Windows sign command failing to sign app uninstaller if it references relative paths.
-- [`bd8a7cf39`](https://www.github.com/tauri-apps/tauri/commit/bd8a7cf39df316bf27c73a303d5e650301af0104) ([#13581](https://www.github.com/tauri-apps/tauri/pull/13581) by [@martpie](https://www.github.com/tauri-apps/tauri/../../martpie)) Fixes app icon not being displayed on Gnome dock and grid view when using Wayland.
-- [`b52da29d5`](https://www.github.com/tauri-apps/tauri/commit/b52da29d5dbdb675ddba438a335e6a59f620e536) ([#13429](https://www.github.com/tauri-apps/tauri/pull/13429) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix `mainBinaryName` doesn't work when there's `.` in it
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.5.0`
-
-## \[2.4.0]
-
-### New Features
-
-- [`b0babb6df`](https://www.github.com/tauri-apps/tauri/commit/b0babb6df12dafe45c21a2c9c424fd86ffd75ca7) ([#12938](https://www.github.com/tauri-apps/tauri/pull/12938)) Added hebrew translation for the custom Tauri messages in the NSIS bundle.
-- [`0aa48fb9e`](https://www.github.com/tauri-apps/tauri/commit/0aa48fb9e4b9d7b5bf3522000a76ebc1836394ed) ([#13030](https://www.github.com/tauri-apps/tauri/pull/13030)) Added `bundleVersion` to iOS and macOS configuration to support specifying a `CFBundleVersion`.
-
-### Enhancements
-
-- [`8d994f60f`](https://www.github.com/tauri-apps/tauri/commit/8d994f60fe05ec0f45cbe926506bbe10b0d36e3c) ([#11676](https://www.github.com/tauri-apps/tauri/pull/11676)) Sign NSIS and WiX DLLs when bundling
-- [`8d994f60f`](https://www.github.com/tauri-apps/tauri/commit/8d994f60fe05ec0f45cbe926506bbe10b0d36e3c) ([#11676](https://www.github.com/tauri-apps/tauri/pull/11676)) Sign DLLs from resources.
-
-### Bug Fixes
-
-- [`9ea76503d`](https://www.github.com/tauri-apps/tauri/commit/9ea76503dcf8da11fab65550f4ab8d3565a424ef) ([#13186](https://www.github.com/tauri-apps/tauri/pull/13186)) Fix NSIS bundler can't include resources and sidecars with `$` in the path
-- [`2dccfab53`](https://www.github.com/tauri-apps/tauri/commit/2dccfab5321fef55d45f3a4c674b6151b1c4424a) ([#13236](https://www.github.com/tauri-apps/tauri/pull/13236)) Fix `fileAssociations` missing `LSHandlerRank` on macOS.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.4.0`
-
-## \[2.3.1]
-
-### Bug Fixes
-
-- [`2138bbc21`](https://www.github.com/tauri-apps/tauri/commit/2138bbc21294785df5f4144670104387289f79c1) ([#13087](https://www.github.com/tauri-apps/tauri/pull/13087) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix NSIS installer displaying in wrong language if `SpanishInternational` is included
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.3.1`
-
-## \[2.3.0]
-
-### Enhancements
-
-- [`f981a5ee8`](https://www.github.com/tauri-apps/tauri/commit/f981a5ee8b292b9ea09329f60cecc7f688dda734) ([#12602](https://www.github.com/tauri-apps/tauri/pull/12602) by [@kxxt](https://www.github.com/tauri-apps/tauri/../../kxxt)) Add basic support for linux riscv64 platform.
-
-### Bug Fixes
-
-- [`3626b7a92`](https://www.github.com/tauri-apps/tauri/commit/3626b7a92be2890a82e8d5bd00d13887e199ea4a) ([#12759](https://www.github.com/tauri-apps/tauri/pull/12759) by [@ninjadev64](https://www.github.com/tauri-apps/tauri/../../ninjadev64)) Fix resources being bundled to the wrong path during RPM bundling when resources are specified as a map.
-- [`2b960dfd9`](https://www.github.com/tauri-apps/tauri/commit/2b960dfd9fdc995bd6474958c05783ff53b64b7e) ([#12643](https://www.github.com/tauri-apps/tauri/pull/12643) by [@animeshchaudhri](https://www.github.com/tauri-apps/tauri/../../animeshchaudhri)) Remove the autostart plugin registry entry when the app is uninstalled (NSIS only).
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.3.0`
-
-## \[2.2.4]
-
-### Enhancements
-
-- [`5eba0785c`](https://www.github.com/tauri-apps/tauri/commit/5eba0785c461a0d0bec47653eaf6ccdf5f05d347) ([#12605](https://www.github.com/tauri-apps/tauri/pull/12605) by [@niusia-ua](https://www.github.com/tauri-apps/tauri/../../niusia-ua)) Added Ukrainian translation for the custom tauri messages in the nsis bundle
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.2.0`
-- Upgraded to `tauri-macos-sign@2.1.0`
-
-## \[2.2.3]
-
-### Bug Fixes
-
-- [`de8600b4d`](https://www.github.com/tauri-apps/tauri/commit/de8600b4d9a04e809e078c8aea61825d1328201f) ([#12471](https://www.github.com/tauri-apps/tauri/pull/12471) by [@anatawa12](https://www.github.com/tauri-apps/tauri/../../anatawa12)) Bumped `nsis-tauri-utils` to `0.4.2` which fixes the following bugs:
-
-  - Fixed launch on start checkbox in nsis installer does not work well with applications that require elevated permissions
-  - Fixed nsis installer may fail to install if launched by updater plugin
-- [`fbe7c9ead`](https://www.github.com/tauri-apps/tauri/commit/fbe7c9ead76e71ca258c6f48bbb62185fcc37b1c) ([#12466](https://www.github.com/tauri-apps/tauri/pull/12466) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused the compiled AppImage to miss webkitgtk's internal `libwebkit2gtkinjectedbundle.so` file.
-- [`f5a59b93b`](https://www.github.com/tauri-apps/tauri/commit/f5a59b93bfefb43ff131a7870b3c5d5e48c1ca1e) ([#12136](https://www.github.com/tauri-apps/tauri/pull/12136) by [@unknovvn](https://www.github.com/tauri-apps/tauri/../../unknovvn)) The NSIS bundler will now replace non-numeric build metadata with `0` instead of returning an error.
-- [`9dac2863a`](https://www.github.com/tauri-apps/tauri/commit/9dac2863afa70fb0bcddf859b284afba917f28ae) ([#12323](https://www.github.com/tauri-apps/tauri/pull/12323) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Skip signing the .dmg if self signing via `"signingIdentity": "-"` is used.
-- [`b8eb28877`](https://www.github.com/tauri-apps/tauri/commit/b8eb28877fe822dbe17999fc8af98ed7d0983679) ([#12427](https://www.github.com/tauri-apps/tauri/pull/12427) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Clean up `Software\${MANUFACTURER}\${PRODUCTNAME}` registry key in the NSIS uninstaller if "Delete application data" option is checked when uninstalling.
-
-## \[2.2.2]
-
-### Bug Fixes
-
-- [`72748cc45`](https://www.github.com/tauri-apps/tauri/commit/72748cc45cf670dd03c86c8deceb5942598f5ad9) ([#12365](https://www.github.com/tauri-apps/tauri/pull/12365) by [@don41382](https://www.github.com/tauri-apps/tauri/../../don41382)) Fixed an issue that caused the `.msi` installer not to lookup the `INSTALLDIR` set in the `nsis` installer.
-- [`cf771bf69`](https://www.github.com/tauri-apps/tauri/commit/cf771bf69aa26b62d11a54a69131c631505d8c55) ([#12402](https://www.github.com/tauri-apps/tauri/pull/12402) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue that caused the .msi installer to not contain root resources when there were .dll files present in the target directory.
-- [`07ccdc499`](https://www.github.com/tauri-apps/tauri/commit/07ccdc499c3240e7240be3abf95ef2d7d00b2dc7) ([#12324](https://www.github.com/tauri-apps/tauri/pull/12324) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) Fixed an issue leading to NSIS based installers to not contain the `WebView2Loader.dll` file when targetting `windows-gnu`.
-
-## \[2.2.1]
-
-### Bug Fixes
-
-- [`cd1d026f9`](https://www.github.com/tauri-apps/tauri/commit/cd1d026f9799c26b04acb64f49e7ee0a8b193049) ([#11961](https://www.github.com/tauri-apps/tauri/pull/11961) by [@Legend-Master](https://www.github.com/tauri-apps/tauri/../../Legend-Master)) Fix tauri fails to build if the project path contains glob characters
-
-## \[2.2.0]
-
-### New Features
-
-- [`cccb308c7`](https://www.github.com/tauri-apps/tauri/commit/cccb308c7b559b0838138d6cea280665f060c925) ([#11562](https://www.github.com/tauri-apps/tauri/pull/11562) by [@jLynx](https://www.github.com/tauri-apps/tauri/../../jLynx)) Generate signature for `.deb` packages when `createUpdaterArtifacts` option is enabled.
-
-### Enhancements
-
-- [`93a3a043d`](https://www.github.com/tauri-apps/tauri/commit/93a3a043d39cc96515d51d98beeb14261d3a246b) ([#11727](https://www.github.com/tauri-apps/tauri/pull/11727) by [@Kiyozz](https://www.github.com/tauri-apps/tauri/../../Kiyozz)) Add support for `Portuguese` language for NSIS windows installer.
-- [`53f808674`](https://www.github.com/tauri-apps/tauri/commit/53f808674b2c0012bc44a41ced90e742afbb41e8) ([#11799](https://www.github.com/tauri-apps/tauri/pull/11799) by [@FabianLars](https://www.github.com/tauri-apps/tauri/../../FabianLars)) The bundler now reads the `TAURI_BUNDLER_DMG_IGNORE_CI` env var to decide whether to check for `CI: true` when building DMG files.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.1.1`
-
-## \[2.1.0]
-
-### New Features
-
-- [`1b6b2cfaa`](https://www.github.com/tauri-apps/tauri/commit/1b6b2cfaa14ab1d418c676cedbf942a812377a30) ([#11521](https://www.github.com/tauri-apps/tauri/pull/11521) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Process `bundle > windows > wix > fragmentPaths` with Handlebars to interpolate expressions within it.
-- [`6dea12a06`](https://www.github.com/tauri-apps/tauri/commit/6dea12a0677a905cb1f14969fe05c53e7cd717c6) ([#11402](https://www.github.com/tauri-apps/tauri/pull/11402) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Add `bundle > linux > deb > recommends` and `bundle > linux > rpm > recommends` fields to declare a strong, but not absolute, dependency for your `.deb` and `.rpm` packages.
-- [`058c0db72`](https://www.github.com/tauri-apps/tauri/commit/058c0db72f43fbe1574d0db654560e693755cd7e) ([#11584](https://www.github.com/tauri-apps/tauri/pull/11584) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Add `bundle > linux > rpm > compression` config option to control RPM bundle compression type and level.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.1.0`
-
-## \[2.0.4]
-
-### New Features
-
-- [`c8f55b615`](https://www.github.com/tauri-apps/tauri/commit/c8f55b615d2d98ade5c0f1896139dc283382a176) ([#11388](https://www.github.com/tauri-apps/tauri/pull/11388) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Add `bundler > windows > wix > version` to manually specify a wix-compatible version.
-
-## \[2.0.3]
-
-### New Features
-
-- [`eda5713ea`](https://www.github.com/tauri-apps/tauri/commit/eda5713eab78d28182071ea25ceca5f1994f37ea) ([#11242](https://www.github.com/tauri-apps/tauri/pull/11242) by [@alex-sandri](https://www.github.com/tauri-apps/tauri/../../alex-sandri)) Add `Italian` to supported NSIS installer languages
-
-### Enhancements
-
-- [`504bb8ec8`](https://www.github.com/tauri-apps/tauri/commit/504bb8ec8cb294c5067357e18328580dd2b950c9) ([#11287](https://www.github.com/tauri-apps/tauri/pull/11287) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Pull upstream changes for the DMG creation script.
-
-### Bug Fixes
-
-- [`069c05e44`](https://www.github.com/tauri-apps/tauri/commit/069c05e44fd6f30083fdc00dd6c0001278898592) ([#11315](https://www.github.com/tauri-apps/tauri/pull/11315) by [@amrbashir](https://www.github.com/tauri-apps/tauri/../../amrbashir)) Fix CLI crashing and failing to find a `.ico` file when `bundle > icon` option is using globs and doesn't have a string that ends with `.ico`.
-
-## \[2.0.2]
-
-### Bug Fixes
-
-- [`858b3516a`](https://www.github.com/tauri-apps/tauri/commit/858b3516a008ae5e6f2af489805896e2c142be10) ([#11217](https://www.github.com/tauri-apps/tauri/pull/11217) by [@kittuov](https://www.github.com/tauri-apps/tauri/../../kittuov)) On Windows, fixed command arguments for `bundle -> windows -> msi -> elevatedUpdateTask`. to work with spaces in `productName`
-- [`a49a19ffa`](https://www.github.com/tauri-apps/tauri/commit/a49a19ffa304f031fb1a04d31a567cc7f42a380a) ([#11218](https://www.github.com/tauri-apps/tauri/pull/11218)) Fix bundling `appimage`, `deb` and `rpm` bundles failing to open when using `mainBinaryName` with spaces.
-
-## \[2.0.1]
-
-### What's Changed
-
-- [`0ab2b3306`](https://www.github.com/tauri-apps/tauri/commit/0ab2b330644b6419f6cee1d5377bfb5cdda2ccf9) ([#11205](https://www.github.com/tauri-apps/tauri/pull/11205) by [@lucasfernog](https://www.github.com/tauri-apps/tauri/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7.
-
-### Dependencies
-
-- Upgraded to `tauri-utils@2.0.1`
-- Upgraded to `tauri-macos-sign@2.0.1`
-
 ## \[2.0.0]
 
 ### What's Changed

crates/tauri-bundler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "tauri-bundler"
-version = "2.7.5"
+version = "2.0.0"
 authors = [
   "George Burton <burtonageo@gmail.com>",
   "Tauri Programme within The Commons Conservancy",
@@ -15,68 +15,64 @@ rust-version = "1.77.2"
 exclude = ["CHANGELOG.md", "/target", "rustfmt.toml"]
 
 [dependencies]
-tauri-utils = { version = "2.8.1", path = "../tauri-utils", features = [
+tauri-utils = { version = "2.0.0", path = "../tauri-utils", features = [
   "resources",
 ] }
-image = "0.25"
-flate2 = "1"
-thiserror = "2"
-anyhow = "1"
-serde_json = "1"
-serde = { version = "1", features = ["derive"] }
-strsim = "0.11"
-tar = "0.4"
+image = "0.25.0"
+flate2 = "1.0"
+anyhow = "1.0"
+thiserror = "1.0"
+serde_json = "1.0"
+serde = { version = "1.0", features = ["derive"] }
+strsim = "0.11.0"
+tar = "0.4.40"
 walkdir = "2"
 handlebars = "6"
-tempfile = "3"
+tempfile = "3.10.1"
 log = { version = "0.4.21", features = ["kv"] }
-dirs = "6"
+dirs = "5"
 os_pipe = "1"
-ureq = { version = "3", default-features = false, features = ["socks-proxy"] }
+ureq = { version = "2.9.6", default-features = false, features = [
+  "socks-proxy",
+] }
 native-tls = { version = "0.2", optional = true }
 hex = "0.4"
 semver = "1"
 sha1 = "0.10"
 sha2 = "0.10"
-zip = { version = "4", default-features = false, features = ["deflate"] }
+zip = { version = "2.0", default-features = false, features = ["deflate"] }
 dunce = "1"
 url = "2"
 uuid = { version = "1", features = ["v4", "v5"] }
 regex = "1"
-goblin = "0.9"
-plist = "1"
-
 
 [target."cfg(target_os = \"windows\")".dependencies]
 bitness = "0.4"
-windows-registry = "0.5"
+windows-registry = "0.2.0"
 glob = "0.3"
 
 [target."cfg(target_os = \"windows\")".dependencies.windows-sys]
-version = "0.60"
+version = "0.59"
 features = ["Win32_System_SystemInformation", "Win32_System_Diagnostics_Debug"]
 
 [target."cfg(target_os = \"macos\")".dependencies]
 icns = { package = "tauri-icns", version = "0.1" }
 time = { version = "0.3", features = ["formatting"] }
-tauri-macos-sign = { version = "2.3.2", path = "../tauri-macos-sign" }
+plist = "1"
+tauri-macos-sign = { version = "2.0.0", path = "../tauri-macos-sign" }
 
 [target."cfg(target_os = \"linux\")".dependencies]
 heck = "0.5"
-ar = "0.9"
-md5 = "0.8"
-rpm = { version = "0.16", features = ["bzip2-compression"] }
-
-[target."cfg(unix)".dependencies]
-which = "8"
+ar = "0.9.0"
+md5 = "0.7.0"
+rpm = "0.15.0"
 
 [lib]
 name = "tauri_bundler"
 path = "src/lib.rs"
 
 [features]
-default = ["rustls", "platform-certs"]
+default = ["rustls"]
 native-tls = ["ureq/native-tls"]
 native-tls-vendored = ["native-tls", "native-tls/vendored"]
-rustls = ["ureq/rustls"]
-platform-certs = ["ureq/platform-verifier"]
+rustls = ["ureq/tls"]

crates/tauri-bundler/src/bundle.rs

@@ -4,77 +4,32 @@
 // SPDX-License-Identifier: MIT
 
 mod category;
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-mod kmp;
+mod common;
 #[cfg(target_os = "linux")]
 mod linux;
 #[cfg(target_os = "macos")]
 mod macos;
+mod path_utils;
 mod platform;
 mod settings;
 mod updater_bundle;
 mod windows;
 
-use tauri_utils::{display_path, platform::Target as TargetPlatform};
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-const BUNDLE_VAR_TOKEN: &[u8] = b"__TAURI_BUNDLE_TYPE_VAR_UNK";
-/// Patch a binary with bundle type information
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-fn patch_binary(binary: &PathBuf, package_type: &PackageType) -> crate::Result<()> {
-  let mut file_data = std::fs::read(binary).expect("Could not read binary file.");
-
-  if let Some(bundle_var_index) = kmp::index_of(BUNDLE_VAR_TOKEN, &file_data) {
-    #[cfg(target_os = "linux")]
-    let bundle_type = match package_type {
-      crate::PackageType::Deb => b"__TAURI_BUNDLE_TYPE_VAR_DEB",
-      crate::PackageType::Rpm => b"__TAURI_BUNDLE_TYPE_VAR_RPM",
-      crate::PackageType::AppImage => b"__TAURI_BUNDLE_TYPE_VAR_APP",
-      _ => {
-        return Err(crate::Error::InvalidPackageType(
-          package_type.short_name().to_owned(),
-          "Linux".to_owned(),
-        ))
-      }
-    };
-    #[cfg(target_os = "windows")]
-    let bundle_type = match package_type {
-      crate::PackageType::Nsis => b"__TAURI_BUNDLE_TYPE_VAR_NSS",
-      crate::PackageType::WindowsMsi => b"__TAURI_BUNDLE_TYPE_VAR_MSI",
-      _ => {
-        return Err(crate::Error::InvalidPackageType(
-          package_type.short_name().to_owned(),
-          "Windows".to_owned(),
-        ))
-      }
-    };
-
-    file_data[bundle_var_index..bundle_var_index + BUNDLE_VAR_TOKEN.len()]
-      .copy_from_slice(bundle_type);
-
-    std::fs::write(binary, &file_data)
-      .map_err(|e| crate::Error::BinaryWriteError(e.to_string()))?;
-  } else {
-    return Err(crate::Error::MissingBundleTypeVar);
-  }
-  Ok(())
-}
+use tauri_utils::display_path;
 
 pub use self::{
   category::AppCategory,
   settings::{
     AppImageSettings, BundleBinary, BundleSettings, CustomSignCommandSettings, DebianSettings,
-    DmgSettings, Entitlements, IosSettings, MacOsSettings, PackageSettings, PackageType, PlistKind,
-    Position, RpmSettings, Settings, SettingsBuilder, Size, UpdaterSettings,
+    DmgSettings, MacOsSettings, PackageSettings, PackageType, Position, RpmSettings, Settings,
+    SettingsBuilder, Size, UpdaterSettings,
   },
 };
+#[cfg(target_os = "macos")]
+use anyhow::Context;
 pub use settings::{NsisSettings, WindowsSettings, WixLanguage, WixLanguageConfig, WixSettings};
 
-use std::{
-  fmt::Write,
-  io::{Seek, SeekFrom},
-  path::PathBuf,
-};
+use std::{fmt::Write, path::PathBuf};
 
 /// Generated bundle metadata.
 #[derive(Debug)]
@@ -95,32 +50,50 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
 
   package_types.sort_by_key(|a| a.priority());
 
-  let target_os = settings.target_platform();
+  let target_os = settings
+    .target()
+    .split('-')
+    .nth(2)
+    .unwrap_or(std::env::consts::OS)
+    .replace("darwin", "macos");
 
-  if *target_os != TargetPlatform::current() {
+  if target_os != std::env::consts::OS {
     log::warn!("Cross-platform compilation is experimental and does not support all features. Please use a matching host system for full compatibility.");
   }
 
   // Sign windows binaries before the bundling step in case neither wix and nsis bundles are enabled
-  sign_binaries_if_needed(settings, target_os)?;
+  if target_os == "windows" {
+    if settings.can_sign() {
+      for bin in settings.binaries() {
+        let bin_path = settings.binary_path(bin);
+        windows::sign::try_sign(&bin_path, settings)?;
+      }
 
-  let main_binary = settings
-    .binaries()
-    .iter()
-    .find(|b| b.main())
-    .expect("Main binary missing in settings");
-  let main_binary_path = settings.binary_path(main_binary);
+      // Sign the sidecar binaries
+      for bin in settings.external_binaries() {
+        let path = bin?;
+        let skip =
+          std::env::var("TAURI_SKIP_SIDECAR_SIGNATURE_CHECK").map_or(false, |v| v == "true");
+        if skip {
+          continue;
+        }
 
-  // We make a copy of the unsigned main_binary so that we can restore it after each package_type step.
-  // This allows us to patch the binary correctly and avoids two issues:
-  //  - modifying a signed binary without updating its PE checksum can break signature verification
-  //    - codesigning tools should handle calculating+updating this, we just need to ensure
-  //      (re)signing is performed after every `patch_binary()` operation
-  //  - signing an already-signed binary can result in multiple signatures, causing verification errors
-  // TODO: change this to work on a copy while preserving the main binary unchanged
-  let mut main_binary_copy = tempfile::tempfile()?;
-  let mut main_binary_orignal = std::fs::File::open(&main_binary_path)?;
-  std::io::copy(&mut main_binary_orignal, &mut main_binary_copy)?;
+        #[cfg(windows)]
+        if windows::sign::verify(&path)? {
+          log::info!(
+            "sidecar at \"{}\" already signed. Skipping...",
+            path.display()
+          );
+          continue;
+        }
+
+        windows::sign::try_sign(&path, settings)?;
+      }
+    } else {
+      #[cfg(not(target_os = "windows"))]
+      log::warn!("Signing, by default, is only supported on Windows hosts, but you can specify a custom signing command in `bundler > windows > sign_command`, for now, skipping signing the installer...");
+    }
+  }
 
   let mut bundles = Vec::<Bundle>::new();
   for package_type in &package_types {
@@ -129,16 +102,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
       continue;
     }
 
-    #[cfg(any(target_os = "linux", target_os = "windows"))]
-    if let Err(e) = patch_binary(&main_binary_path, package_type) {
-      log::warn!("Failed to add bundler type to the binary: {e}. Updater plugin may not be able to update this package. This shouldn't normally happen, please report it to https://github.com/tauri-apps/tauri/issues");
-    }
-
-    // sign main binary for every package type after patch
-    if matches!(target_os, TargetPlatform::Windows) && settings.windows().can_sign() {
-      windows::sign::try_sign(&main_binary_path, settings)?;
-    }
-
     let bundle_paths = match package_type {
       #[cfg(target_os = "macos")]
       PackageType::MacOsBundle => macos::app::bundle_project(settings)?,
@@ -159,7 +122,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
 
       #[cfg(target_os = "windows")]
       PackageType::WindowsMsi => windows::msi::bundle_project(settings, false)?,
-      // note: don't restrict to windows as NSIS installers can be built in linux using cargo-xwin
       PackageType::Nsis => windows::nsis::bundle_project(settings, false)?,
 
       #[cfg(target_os = "linux")]
@@ -178,14 +140,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
       package_type: package_type.to_owned(),
       bundle_paths,
     });
-
-    // Restore unsigned and unpatched binary
-    let mut modified_main_binary = std::fs::OpenOptions::new()
-      .write(true)
-      .truncate(true)
-      .open(&main_binary_path)?;
-    main_binary_copy.seek(SeekFrom::Start(0))?;
-    std::io::copy(&mut main_binary_copy, &mut modified_main_binary)?;
   }
 
   if let Some(updater) = settings.updater() {
@@ -197,7 +151,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
             | PackageType::MacOsBundle
             | PackageType::Nsis
             | PackageType::WindowsMsi
-            | PackageType::Deb
         )
       } else {
         matches!(package_type, PackageType::MacOsBundle)
@@ -213,7 +166,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
         // Self contained updater, no need to zip
         matches!(
           package_type,
-          PackageType::AppImage | PackageType::Nsis | PackageType::WindowsMsi | PackageType::Deb
+          PackageType::AppImage | PackageType::Nsis | PackageType::WindowsMsi
         )
       })
     {
@@ -235,30 +188,31 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
         .map(|b| b.bundle_paths)
       {
         for app_bundle_path in &app_bundle_paths {
-          use crate::error::ErrorExt;
-
           log::info!(action = "Cleaning"; "{}", app_bundle_path.display());
           match app_bundle_path.is_dir() {
             true => std::fs::remove_dir_all(app_bundle_path),
             false => std::fs::remove_file(app_bundle_path),
           }
-          .fs_context(
-            "failed to clean the app bundle",
-            app_bundle_path.to_path_buf(),
-          )?;
+          .with_context(|| {
+            format!(
+              "Failed to clean the app bundle at {}",
+              app_bundle_path.display()
+            )
+          })?
         }
       }
     }
   }
 
   if bundles.is_empty() {
-    return Ok(bundles);
+    return Err(anyhow::anyhow!("No bundles were built").into());
   }
 
-  let finished_bundles = bundles
+  let bundles_wo_updater = bundles
     .iter()
     .filter(|b| b.package_type != PackageType::Updater)
-    .count();
+    .collect::<Vec<_>>();
+  let finished_bundles = bundles_wo_updater.len();
   let pluralised = if finished_bundles == 1 {
     "bundle"
   } else {
@@ -283,51 +237,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<Bundle>> {
   Ok(bundles)
 }
 
-fn sign_binaries_if_needed(settings: &Settings, target_os: &TargetPlatform) -> crate::Result<()> {
-  if matches!(target_os, TargetPlatform::Windows) {
-    if settings.windows().can_sign() {
-      if settings.no_sign() {
-        log::warn!("Skipping binary signing due to --no-sign flag.");
-        return Ok(());
-      }
-
-      for bin in settings.binaries() {
-        if bin.main() {
-          // we will sign the main binary after patching per "package type"
-          continue;
-        }
-        let bin_path = settings.binary_path(bin);
-        windows::sign::try_sign(&bin_path, settings)?;
-      }
-
-      // Sign the sidecar binaries
-      for bin in settings.external_binaries() {
-        let path = bin?;
-        let skip = std::env::var("TAURI_SKIP_SIDECAR_SIGNATURE_CHECK").is_ok_and(|v| v == "true");
-        if skip {
-          continue;
-        }
-
-        #[cfg(windows)]
-        if windows::sign::verify(&path)? {
-          log::info!(
-            "sidecar at \"{}\" already signed. Skipping...",
-            path.display()
-          );
-          continue;
-        }
-
-        windows::sign::try_sign(&path, settings)?;
-      }
-    } else {
-      #[cfg(not(target_os = "windows"))]
-      log::warn!("Signing, by default, is only supported on Windows hosts, but you can specify a custom signing command in `bundler > windows > sign_command`, for now, skipping signing the installer...");
-    }
-  }
-
-  Ok(())
-}
-
 /// Check to see if there are icons in the settings struct
 pub fn check_icons(settings: &Settings) -> crate::Result<bool> {
   // make a peekable iterator of the icon_files

crates/tauri-bundler/src/bundle/category.rs

@@ -249,7 +249,7 @@ struct AppCategoryVisitor {
   did_you_mean: Option<&'static str>,
 }
 
-impl serde::de::Visitor<'_> for AppCategoryVisitor {
+impl<'d> serde::de::Visitor<'d> for AppCategoryVisitor {
   type Value = AppCategory;
 
   fn expecting(&self, formatter: &mut fmt::Formatter<'_>) -> fmt::Result {

crates/tauri-bundler/src/bundle/common.rs

@@ -4,11 +4,28 @@
 // SPDX-License-Identifier: MIT
 
 use std::{
+  ffi::OsStr,
   fs::{self, File},
-  io::{self, BufWriter},
+  io::{self, BufRead, BufReader, BufWriter},
   path::Path,
+  process::{Command, ExitStatus, Output, Stdio},
+  sync::{Arc, Mutex},
 };
 
+/// Returns true if the path has a filename indicating that it is a high-density
+/// "retina" icon.  Specifically, returns true the file stem ends with
+/// "@2x" (a convention specified by the [Apple developer docs](
+/// <https://developer.apple.com/library/mac/documentation/GraphicsAnimation/Conceptual/HighResolutionOSX/Optimizing/Optimizing.html>)).
+#[allow(dead_code)]
+pub fn is_retina<P: AsRef<Path>>(path: P) -> bool {
+  path
+    .as_ref()
+    .file_stem()
+    .and_then(OsStr::to_str)
+    .map(|stem| stem.ends_with("@2x"))
+    .unwrap_or(false)
+}
+
 /// Creates a new file at the given path, creating any parent directories as
 /// needed.
 pub fn create_file(path: &Path) -> crate::Result<BufWriter<File>> {
@@ -19,36 +36,6 @@ pub fn create_file(path: &Path) -> crate::Result<BufWriter<File>> {
   Ok(BufWriter::new(file))
 }
 
-/// Creates the given directory path,
-/// erasing it first if specified.
-#[allow(dead_code)]
-pub fn create_dir(path: &Path, erase: bool) -> crate::Result<()> {
-  if erase && path.exists() {
-    remove_dir_all(path)?;
-  }
-  Ok(fs::create_dir(path)?)
-}
-
-/// Creates all of the directories of the specified path,
-/// erasing it first if specified.
-#[allow(dead_code)]
-pub fn create_dir_all(path: &Path, erase: bool) -> crate::Result<()> {
-  if erase && path.exists() {
-    remove_dir_all(path)?;
-  }
-  Ok(fs::create_dir_all(path)?)
-}
-
-/// Removes the directory and its contents if it exists.
-#[allow(dead_code)]
-pub fn remove_dir_all(path: &Path) -> crate::Result<()> {
-  if path.exists() {
-    Ok(fs::remove_dir_all(path)?)
-  } else {
-    Ok(())
-  }
-}
-
 /// Makes a symbolic link to a directory.
 #[cfg(unix)]
 #[allow(dead_code)]
@@ -76,9 +63,11 @@ fn symlink_file(src: &Path, dst: &Path) -> io::Result<()> {
 }
 
 /// Copies a regular file from one path to another, creating any parent
-/// directories of the destination path as necessary. Fails if the source path
+/// directories of the destination path as necessary.  Fails if the source path
 /// is a directory or doesn't exist.
-pub fn copy_file(from: &Path, to: &Path) -> crate::Result<()> {
+pub fn copy_file(from: impl AsRef<Path>, to: impl AsRef<Path>) -> crate::Result<()> {
+  let from = from.as_ref();
+  let to = to.as_ref();
   if !from.exists() {
     return Err(crate::Error::GenericError(format!(
       "{from:?} does not exist"
@@ -111,6 +100,9 @@ pub fn copy_dir(from: &Path, to: &Path) -> crate::Result<()> {
       "{from:?} is not a Directory"
     )));
   }
+  if to.exists() {
+    return Err(crate::Error::GenericError(format!("{to:?} already exists")));
+  }
   let parent = to.parent().expect("No data in parent");
   fs::create_dir_all(parent)?;
   for entry in walkdir::WalkDir::new(from) {
@@ -126,7 +118,7 @@ pub fn copy_dir(from: &Path, to: &Path) -> crate::Result<()> {
         symlink_file(&target, &dest_path)?;
       }
     } else if entry.file_type().is_dir() {
-      fs::create_dir_all(dest_path)?;
+      fs::create_dir(dest_path)?;
     } else {
       fs::copy(entry.path(), dest_path)?;
     }
@@ -159,7 +151,7 @@ pub fn copy_custom_files(
       pkg_path
     };
     if path.is_file() {
-      copy_file(path, &data_dir.join(pkg_path))?;
+      copy_file(path, data_dir.join(pkg_path))?;
     } else {
       copy_dir(path, &data_dir.join(pkg_path))?;
     }
@@ -167,10 +159,93 @@ pub fn copy_custom_files(
   Ok(())
 }
 
+pub trait CommandExt {
+  // The `pipe` function sets the stdout and stderr to properly
+  // show the command output in the Node.js wrapper.
+  fn piped(&mut self) -> std::io::Result<ExitStatus>;
+  fn output_ok(&mut self) -> crate::Result<Output>;
+}
+
+impl CommandExt for Command {
+  fn piped(&mut self) -> std::io::Result<ExitStatus> {
+    self.stdin(os_pipe::dup_stdin()?);
+    self.stdout(os_pipe::dup_stdout()?);
+    self.stderr(os_pipe::dup_stderr()?);
+    let program = self.get_program().to_string_lossy().into_owned();
+    log::debug!(action = "Running"; "Command `{} {}`", program, self.get_args().map(|arg| arg.to_string_lossy()).fold(String::new(), |acc, arg| format!("{acc} {arg}")));
+
+    self.status().map_err(Into::into)
+  }
+
+  fn output_ok(&mut self) -> crate::Result<Output> {
+    let program = self.get_program().to_string_lossy().into_owned();
+    log::debug!(action = "Running"; "Command `{} {}`", program, self.get_args().map(|arg| arg.to_string_lossy()).fold(String::new(), |acc, arg| format!("{acc} {arg}")));
+
+    self.stdout(Stdio::piped());
+    self.stderr(Stdio::piped());
+
+    let mut child = self.spawn()?;
+
+    let mut stdout = child.stdout.take().map(BufReader::new).unwrap();
+    let stdout_lines = Arc::new(Mutex::new(Vec::new()));
+    let stdout_lines_ = stdout_lines.clone();
+    std::thread::spawn(move || {
+      let mut line = String::new();
+      let mut lines = stdout_lines_.lock().unwrap();
+      loop {
+        line.clear();
+        match stdout.read_line(&mut line) {
+          Ok(0) => break,
+          Ok(_) => {
+            log::debug!(action = "stdout"; "{}", line.trim_end());
+            lines.extend(line.as_bytes().to_vec());
+          }
+          Err(_) => (),
+        }
+      }
+    });
+
+    let mut stderr = child.stderr.take().map(BufReader::new).unwrap();
+    let stderr_lines = Arc::new(Mutex::new(Vec::new()));
+    let stderr_lines_ = stderr_lines.clone();
+    std::thread::spawn(move || {
+      let mut line = String::new();
+      let mut lines = stderr_lines_.lock().unwrap();
+      loop {
+        line.clear();
+        match stderr.read_line(&mut line) {
+          Ok(0) => break,
+          Ok(_) => {
+            log::debug!(action = "stderr"; "{}", line.trim_end());
+            lines.extend(line.as_bytes().to_vec());
+          }
+          Err(_) => (),
+        }
+      }
+    });
+
+    let status = child.wait()?;
+    let output = Output {
+      status,
+      stdout: std::mem::take(&mut *stdout_lines.lock().unwrap()),
+      stderr: std::mem::take(&mut *stderr_lines.lock().unwrap()),
+    };
+
+    if output.status.success() {
+      Ok(output)
+    } else {
+      Err(crate::Error::GenericError(format!(
+        "failed to run {program}"
+      )))
+    }
+  }
+}
+
 #[cfg(test)]
 mod tests {
-  use super::create_file;
-  use std::io::Write;
+  use super::{create_file, is_retina};
+  use std::{io::Write, path::PathBuf};
+  use tauri_utils::resources::resource_relpath;
 
   #[test]
   fn create_file_with_parent_dirs() {
@@ -188,8 +263,6 @@ mod tests {
   #[cfg(not(windows))]
   #[test]
   fn copy_dir_with_symlinks() {
-    use std::path::PathBuf;
-
     // Create a directory structure that looks like this:
     //   ${TMP}/orig/
     //       sub/
@@ -237,4 +310,26 @@ mod tests {
       b"Hello, world!\n"
     );
   }
+
+  #[test]
+  fn retina_icon_paths() {
+    assert!(!is_retina("data/icons/512x512.png"));
+    assert!(is_retina("data/icons/512x512@2x.png"));
+  }
+
+  #[test]
+  fn resource_relative_paths() {
+    assert_eq!(
+      resource_relpath(&PathBuf::from("./data/images/button.png")),
+      PathBuf::from("data/images/button.png")
+    );
+    assert_eq!(
+      resource_relpath(&PathBuf::from("../../images/wheel.png")),
+      PathBuf::from("_up_/_up_/images/wheel.png")
+    );
+    assert_eq!(
+      resource_relpath(&PathBuf::from("/home/ferris/crab.png")),
+      PathBuf::from("_root_/home/ferris/crab.png")
+    );
+  }
 }

crates/tauri-bundler/src/bundle/kmp/mod.rs

@@ -1,61 +0,0 @@
-// Copyright 2016-2019 Cargo-Bundle developers <https://github.com/burtonageo/cargo-bundle>
-// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
-// SPDX-License-Identifier: Apache-2.0
-// SPDX-License-Identifier: MIT
-
-// Knuth–Morris–Pratt algorithm
-// based on https://github.com/howeih/rust_kmp
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-pub fn index_of(pattern: &[u8], target: &[u8]) -> Option<usize> {
-  let failure_function = find_failure_function(pattern);
-
-  let mut t_i: usize = 0;
-  let mut p_i: usize = 0;
-  let target_len = target.len();
-  let mut result_idx = None;
-  let pattern_len = pattern.len();
-
-  while (t_i < target_len) && (p_i < pattern_len) {
-    if target[t_i] == pattern[p_i] {
-      if result_idx.is_none() {
-        result_idx.replace(t_i);
-      }
-      t_i += 1;
-      p_i += 1;
-      if p_i >= pattern_len {
-        return result_idx;
-      }
-    } else {
-      if p_i == 0 {
-        p_i = 0;
-        t_i += 1;
-      } else {
-        p_i = failure_function[p_i - 1];
-      }
-      result_idx = None;
-    }
-  }
-  None
-}
-
-#[cfg(any(target_os = "linux", target_os = "windows"))]
-fn find_failure_function(pattern: &[u8]) -> Vec<usize> {
-  let mut i = 1;
-  let mut j = 0;
-  let pattern_length = pattern.len();
-  let end_i = pattern_length - 1;
-  let mut failure_function = vec![0usize; pattern_length];
-  while i <= end_i {
-    if pattern[i] == pattern[j] {
-      failure_function[i] = j + 1;
-      i += 1;
-      j += 1;
-    } else if j == 0 {
-      failure_function[i] = 0;
-      i += 1;
-    } else {
-      j = failure_function[j - 1];
-    }
-  }
-  failure_function
-}

crates/tauri-bundler/src/bundle/linux/appimage/appimage

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+# SPDX-License-Identifier: Apache-2.0
+# SPDX-License-Identifier: MIT
+
+set -euxo pipefail
+
+export ARCH={{arch}}
+APPIMAGE_BUNDLE_XDG_OPEN=${APPIMAGE_BUNDLE_XDG_OPEN-0}
+APPIMAGE_BUNDLE_XDG_MIME=${APPIMAGE_BUNDLE_XDG_MIME-0}
+APPIMAGE_BUNDLE_GSTREAMER=${APPIMAGE_BUNDLE_GSTREAMER-0}
+TAURI_TRAY_LIBRARY_PATH=${TAURI_TRAY_LIBRARY_PATH-0}
+
+if [ "$ARCH" == "i686" ]; then
+    linuxdeploy_arch="i386"
+else
+    linuxdeploy_arch="$ARCH"
+fi
+
+mkdir -p "{{product_name}}.AppDir"
+cp -r ../appimage_deb/data/usr "{{product_name}}.AppDir"
+
+cd "{{product_name}}.AppDir"
+mkdir -p "usr/bin"
+mkdir -p "usr/lib"
+
+if [[ "$APPIMAGE_BUNDLE_XDG_OPEN" != "0" ]] && [[ -f "/usr/bin/xdg-open" ]]; then
+  echo "Copying /usr/bin/xdg-open"
+  cp /usr/bin/xdg-open usr/bin
+fi
+
+if [[ "$APPIMAGE_BUNDLE_XDG_MIME" != "0" ]] && [[ -f "/usr/bin/xdg-mime" ]]; then
+  echo "Copying /usr/bin/xdg-mime"
+  cp /usr/bin/xdg-mime usr/bin
+fi
+
+if [[ "$TAURI_TRAY_LIBRARY_PATH" != "0" ]]; then
+  echo "Copying appindicator library ${TAURI_TRAY_LIBRARY_PATH}"
+  cp ${TAURI_TRAY_LIBRARY_PATH} usr/lib
+  # It looks like we're practicing good hygiene by adding the ABI version.
+  # But for compatibility we'll symlink this file to what we did before.
+  # Specifically this prevents breaking libappindicator-sys v0.7.1 and v0.7.2.
+  if [[ "$TAURI_TRAY_LIBRARY_PATH" == *.so.1 ]]; then
+    readonly soname=$(basename "$TAURI_TRAY_LIBRARY_PATH")
+    readonly old_name=$(basename "$TAURI_TRAY_LIBRARY_PATH" .1)
+    echo "Adding compatibility symlink ${old_name} -> ${soname}"
+    ln -s ${soname} usr/lib/${old_name}
+  fi
+fi
+
+# Copy WebKit files. Follow symlinks in case `/usr/lib64` is a symlink to `/usr/lib`
+find -L /usr/lib* -name WebKitNetworkProcess -exec mkdir -p "$(dirname '{}')" \; -exec cp --parents '{}' "." \; || true
+find -L /usr/lib* -name WebKitWebProcess -exec mkdir -p "$(dirname '{}')" \; -exec cp --parents '{}' "." \; || true
+find -L /usr/lib* -name libwebkit2gtkinjectedbundle.so -exec mkdir -p "$(dirname '{}')" \; -exec cp --parents '{}' "." \; || true
+
+( cd "{{tauri_tools_path}}" && ( wget -q -4 -N https://github.com/AppImage/AppImageKit/releases/download/continuous/AppRun-${ARCH} || wget -q -4 -N https://github.com/AppImage/AppImageKit/releases/download/12/AppRun-${ARCH} ) )
+chmod +x "{{tauri_tools_path}}/AppRun-${ARCH}"
+
+# We need AppRun to be installed as {{product_name}}.AppDir/AppRun.
+# Otherwise the linuxdeploy scripts will default to symlinking our main bin instead and will crash on trying to launch.
+cp "{{tauri_tools_path}}/AppRun-${ARCH}" AppRun
+
+cp "{{icon_path}}" .DirIcon
+ln -sf "{{icon_path}}" "{{product_name}}.png"
+
+ln -sf "usr/share/applications/{{product_name}}.desktop" "{{product_name}}.desktop"
+
+cd ..
+
+if [[ "$APPIMAGE_BUNDLE_GSTREAMER" != "0" ]]; then
+  gst_plugin="--plugin gstreamer"
+  wget -q -4 -N "https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gstreamer/master/linuxdeploy-plugin-gstreamer.sh"
+  chmod +x linuxdeploy-plugin-gstreamer.sh
+else
+  gst_plugin=""
+fi
+
+( cd "{{tauri_tools_path}}" && wget -q -4 -N https://raw.githubusercontent.com/tauri-apps/linuxdeploy-plugin-gtk/master/linuxdeploy-plugin-gtk.sh )
+( cd "{{tauri_tools_path}}" && wget -q -4 -N https://github.com/tauri-apps/binary-releases/releases/download/linuxdeploy/linuxdeploy-${linuxdeploy_arch}.AppImage )
+
+chmod +x "{{tauri_tools_path}}/linuxdeploy-plugin-gtk.sh"
+chmod +x "{{tauri_tools_path}}/linuxdeploy-${linuxdeploy_arch}.AppImage"
+
+dd if=/dev/zero bs=1 count=3 seek=8 conv=notrunc of="{{tauri_tools_path}}/linuxdeploy-${linuxdeploy_arch}.AppImage"
+
+OUTPUT="{{appimage_filename}}" "{{tauri_tools_path}}/linuxdeploy-${linuxdeploy_arch}.AppImage" --appimage-extract-and-run --appdir "{{product_name}}.AppDir" --plugin gtk ${gst_plugin} --output appimage

crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gstreamer.sh

@@ -1,165 +0,0 @@
-#! /bin/bash
-
-# abort on all errors
-set -e
-
-if [ "$DEBUG" != "" ]; then
-    set -x
-fi
-
-script=$(readlink -f "$0")
-
-show_usage() {
-    echo "Usage: $script --appdir <path to AppDir>"
-    echo
-    echo "Bundles GStreamer plugins into an AppDir"
-    echo
-    echo "Required variables:"
-    echo "  LINUXDEPLOY=\".../linuxdeploy\" path to linuxdeploy (e.g., AppImage); set automatically when plugin is run directly by linuxdeploy"
-    echo
-    echo "Optional variables:"
-    echo "  GSTREAMER_INCLUDE_BAD_PLUGINS=\"1\" (default: disabled; set to empty string or unset to disable)"
-    echo "  GSTREAMER_PLUGINS_DIR=\"...\" (directory containing GStreamer plugins; default: guessed based on main distro architecture)"
-    echo "  GSTREAMER_HELPERS_DIR=\"...\" (directory containing GStreamer helper tools like gst-plugin-scanner; default: guessed based on main distro architecture)"
-    echo "  GSTREAMER_VERSION=\"1.0\" (default: 1.0)"
-}
-
-while [ "$1" != "" ]; do
-    case "$1" in
-        --plugin-api-version)
-            echo "0"
-            exit 0
-            ;;
-        --appdir)
-            APPDIR="$2"
-            shift
-            shift
-            ;;
-        --help)
-            show_usage
-            exit 0
-            ;;
-        *)
-            echo "Invalid argument: $1"
-            echo
-            show_usage
-            exit 1
-            ;;
-    esac
-done
-
-if [ "$APPDIR" == "" ]; then
-    show_usage
-    exit 1
-fi
-
-if ! which patchelf &>/dev/null && ! type patchelf &>/dev/null; then
-    echo "Error: patchelf not found"
-    echo
-    show_usage
-    exit 2
-fi
-
-if [[ "$LINUXDEPLOY" == "" ]]; then
-    echo "Error: \$LINUXDEPLOY not set"
-    echo
-    show_usage
-    exit 3
-fi
-
-mkdir -p "$APPDIR"
-
-export GSTREAMER_VERSION="${GSTREAMER_VERSION:-1.0}"
-
-plugins_target_dir="$APPDIR"/usr/lib/gstreamer-"$GSTREAMER_VERSION"
-helpers_target_dir="$APPDIR"/usr/lib/gstreamer"$GSTREAMER_VERSION"/gstreamer-"$GSTREAMER_VERSION"
-
-if [ "$GSTREAMER_PLUGINS_DIR" != "" ]; then
-    plugins_dir="${GSTREAMER_PLUGINS_DIR}"
-elif [ -d /usr/lib/"$(uname -m)"-linux-gnu/gstreamer-"$GSTREAMER_VERSION" ]; then
-    plugins_dir=/usr/lib/$(uname -m)-linux-gnu/gstreamer-"$GSTREAMER_VERSION"
-else
-    plugins_dir=/usr/lib/gstreamer-"$GSTREAMER_VERSION"
-fi
-
-if [ "$GSTREAMER_HELPERS_DIR" != "" ]; then
-    helpers_dir="${GSTREAMER_HELPERS_DIR}"
-else
-    helpers_dir=/usr/lib/$(uname -m)-linux-gnu/gstreamer"$GSTREAMER_VERSION"/gstreamer-"$GSTREAMER_VERSION"
-fi
-
-if [ ! -d "$plugins_dir" ]; then
-    echo "Error: could not find plugins directory: $plugins_dir"
-    exit 1
-fi
-
-mkdir -p "$plugins_target_dir"
-
-echo "Copying plugins into $plugins_target_dir"
-for i in "$plugins_dir"/*; do
-    [ -d "$i" ] && continue
-    [ ! -f "$i" ] && echo "File does not exist: $i" && continue
-
-    echo "Copying plugin: $i"
-    cp "$i" "$plugins_target_dir"
-done
-
-"$LINUXDEPLOY" --appdir "$APPDIR"
-
-for i in "$plugins_target_dir"/*; do
-    [ -d "$i" ] && continue
-    [ ! -f "$i" ] && echo "File does not exist: $i" && continue
-    (file "$i" | grep -v ELF --silent) && echo "Ignoring non ELF file: $i" && continue
-
-    echo "Manually setting rpath for $i"
-    patchelf --set-rpath '$ORIGIN/..:$ORIGIN' "$i"
-done
-
-mkdir -p "$helpers_target_dir"
-
-echo "Copying helpers in $helpers_target_dir"
-for i in "$helpers_dir"/*; do
-    [ -d "$i" ] && continue
-    [ ! -f "$i" ] && echo "File does not exist: $i" && continue
-
-    echo "Copying helper: $i"
-    cp "$i" "$helpers_target_dir"
-done
-
-for i in "$helpers_target_dir"/*; do
-    [ -d "$i" ] && continue
-    [ ! -f "$i" ] && echo "File does not exist: $i" && continue
-    (file "$i" | grep -v ELF --silent) && echo "Ignoring non ELF file: $i" && continue
-
-    echo "Manually setting rpath for $i"
-    patchelf --set-rpath '$ORIGIN/../..' "$i"
-done
-
-echo "Installing AppRun hook"
-mkdir -p "$APPDIR"/apprun-hooks
-
-if [ "$GSTREAMER_VERSION" == "1.0" ]; then
-    cat > "$APPDIR"/apprun-hooks/linuxdeploy-plugin-gstreamer.sh <<\EOF
-#! /bin/bash
-
-export GST_REGISTRY_REUSE_PLUGIN_SCANNER="no"
-export GST_PLUGIN_SYSTEM_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0"
-export GST_PLUGIN_PATH_1_0="${APPDIR}/usr/lib/gstreamer-1.0"
-
-export GST_PLUGIN_SCANNER_1_0="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
-export GST_PTP_HELPER_1_0="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-ptp-helper"
-EOF
-elif [ "$GSTREAMER_VERSION" == "0.10" ]; then
-    cat > "$APPDIR"/apprun-hooks/linuxdeploy-plugin-gstreamer.sh <<\EOF
-#! /bin/bash
-
-export GST_REGISTRY_REUSE_PLUGIN_SCANNER="no"
-export GST_PLUGIN_SYSTEM_PATH_0_10="${APPDIR}/usr/lib/gstreamer-1.0"
-
-export GST_PLUGIN_SCANNER_0_10="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-plugin-scanner"
-export GST_PTP_HELPER_0_10="${APPDIR}/usr/lib/gstreamer1.0/gstreamer-1.0/gst-ptp-helper"
-EOF
-else
-    echo "Warning: unknown GStreamer version: $GSTREAMER_VERSION, cannot install AppRun hook"
-fi
-

crates/tauri-bundler/src/bundle/linux/appimage/linuxdeploy-plugin-gtk.sh

@@ -1,327 +0,0 @@
-#! /usr/bin/env bash
-
-# GTK3 environment variables: https://developer.gnome.org/gtk3/stable/gtk-running.html
-# GTK4 environment variables: https://developer.gnome.org/gtk4/stable/gtk-running.html
-
-# abort on all errors
-set -e
-
-if [ "$DEBUG" != "" ]; then
-    set -x
-    verbose="--verbose"
-fi
-
-script=$(readlink -f "$0")
-
-show_usage() {
-    echo "Usage: $script --appdir <path to AppDir>"
-    echo
-    echo "Bundles resources for applications that use GTK into an AppDir"
-    echo
-    echo "Required variables:"
-    echo "  LINUXDEPLOY=\".../linuxdeploy\" path to linuxdeploy (e.g., AppImage); set automatically when plugin is run directly by linuxdeploy"
-    #echo
-    #echo "Optional variables:"
-    #echo "  DEPLOY_GTK_VERSION (major version of GTK to deploy, e.g. '2', '3' or '4'; auto-detect by default)"
-}
-
-variable_is_true() {
-    local var="$1"
-
-    if [ -n "$var" ] && { [ "$var" == "true" ] || [ "$var" -gt 0 ]; } 2> /dev/null; then
-        return 0 # true
-    else
-        return 1 # false
-    fi
-}
-
-get_pkgconf_variable() {
-    local variable="$1"
-    local library="$2"
-    local default_path="$3"
-
-    path="$("$PKG_CONFIG" --variable="$variable" "$library")"
-    if [ -n "$path" ]; then
-        echo "$path"
-    elif [ -n "$default_path" ]; then
-        echo "$default_path"
-    else
-        echo "$0: there is no '$variable' variable for '$library' library." > /dev/stderr
-        echo "Please check the '$library.pc' file is present in \$PKG_CONFIG_PATH (you may need to install the appropriate -dev/-devel package)." > /dev/stderr
-        exit 1
-    fi
-}
-
-copy_tree() {
-    local src=("${@:1:$#-1}")
-    local dst="${*:$#}"
-
-    for elem in "${src[@]}"; do
-        mkdir -p "${dst::-1}$elem"
-        cp "$elem" --archive --parents --target-directory="$dst" $verbose
-    done
-}
-
-search_tool() {
-    local tool="$1"
-    local directory="$2"
-
-    if command -v "$tool"; then
-        return 0
-    fi
-
-    PATH_ARRAY=(
-        "/usr/lib/$(uname -m)-linux-gnu/$directory/$tool"
-        "/usr/lib/$directory/$tool"
-        "/usr/bin/$tool"
-        "/usr/bin/$tool-64"
-        "/usr/bin/$tool-32"
-    )
-
-    for path in "${PATH_ARRAY[@]}"; do
-        if [ -x "$path" ]; then
-            echo "$path"
-            return 0
-        fi
-    done
-}
-
-#DEPLOY_GTK_VERSION="${DEPLOY_GTK_VERSION:-0}" # When not set by user, this variable use the integer '0' as a sentinel value
-DEPLOY_GTK_VERSION=3 # Force GTK3 for tauri apps
-APPDIR=
-
-while [ "$1" != "" ]; do
-    case "$1" in
-        --plugin-api-version)
-            echo "0"
-            exit 0
-            ;;
-        --appdir)
-            APPDIR="$2"
-            shift
-            shift
-            ;;
-        --help)
-            show_usage
-            exit 0
-            ;;
-        *)
-            echo "Invalid argument: $1"
-            echo
-            show_usage
-            exit 1
-            ;;
-    esac
-done
-
-if [ "$APPDIR" == "" ]; then
-    show_usage
-    exit 1
-fi
-
-mkdir -p "$APPDIR"
-# make lib64 writable again.
-chmod +w "$APPDIR"/usr/lib64 || true
-
-if command -v pkgconf > /dev/null; then
-    PKG_CONFIG="pkgconf"
-elif command -v pkg-config > /dev/null; then
-    PKG_CONFIG="pkg-config"
-else
-    echo "$0: pkg-config/pkgconf not found in PATH, aborting"
-    exit 1
-fi
-
-if ! command -v find &>/dev/null && ! type find &>/dev/null; then
-    echo -e "$0: find not found.\nInstall findutils then re-run the plugin."
-    exit 1
-fi
-
-if [ -z "$LINUXDEPLOY" ]; then
-    echo -e "$0: LINUXDEPLOY environment variable is not set.\nDownload a suitable linuxdeploy AppImage, set the environment variable and re-run the plugin."
-    exit 1
-fi
-
-gtk_versions=0 # Count major versions of GTK when auto-detect GTK version
-if [ "$DEPLOY_GTK_VERSION" -eq 0 ]; then
-    echo "Determining which GTK version to deploy"
-    while IFS= read -r -d '' file; do
-        if [ "$DEPLOY_GTK_VERSION" -ne 2 ] && ldd "$file" | grep -q "libgtk-x11-2.0.so"; then
-            DEPLOY_GTK_VERSION=2
-            gtk_versions="$((gtk_versions+1))"
-        fi
-        if [ "$DEPLOY_GTK_VERSION" -ne 3 ] && ldd "$file" | grep -q "libgtk-3.so"; then
-            DEPLOY_GTK_VERSION=3
-            gtk_versions="$((gtk_versions+1))"
-        fi
-        if [ "$DEPLOY_GTK_VERSION" -ne 4 ] && ldd "$file" | grep -q "libgtk-4.so"; then
-            DEPLOY_GTK_VERSION=4
-            gtk_versions="$((gtk_versions+1))"
-        fi
-    done < <(find "$APPDIR/usr/bin" -executable -type f -print0)
-fi
-
-if [ "$gtk_versions" -gt 1 ]; then
-    echo "$0: can not deploy multiple GTK versions at the same time."
-    echo "Please set DEPLOY_GTK_VERSION to {2, 3, 4}."
-    exit 1
-elif [ "$DEPLOY_GTK_VERSION" -eq 0 ]; then
-    echo "$0: failed to auto-detect GTK version."
-    echo "Please set DEPLOY_GTK_VERSION to {2, 3, 4}."
-    exit 1
-fi
-
-echo "Installing AppRun hook"
-HOOKSDIR="$APPDIR/apprun-hooks"
-HOOKFILE="$HOOKSDIR/linuxdeploy-plugin-gtk.sh"
-mkdir -p "$HOOKSDIR"
-cat > "$HOOKFILE" <<\EOF
-#! /usr/bin/env bash
-
-gsettings get org.gnome.desktop.interface gtk-theme 2> /dev/null | grep -qi "dark" && GTK_THEME_VARIANT="dark" || GTK_THEME_VARIANT="light"
-APPIMAGE_GTK_THEME="${APPIMAGE_GTK_THEME:-"Adwaita:$GTK_THEME_VARIANT"}" # Allow user to override theme (discouraged)
-
-export APPDIR="${APPDIR:-"$(dirname "$(realpath "$0")")"}" # Workaround to run extracted AppImage
-export GTK_DATA_PREFIX="$APPDIR"
-export GTK_THEME="$APPIMAGE_GTK_THEME" # Custom themes are broken
-export GDK_BACKEND=x11 # Crash with Wayland backend on Wayland - We tested it without it and ended up with this: https://github.com/tauri-apps/tauri/issues/8541
-export XDG_DATA_DIRS="$APPDIR/usr/share:/usr/share:$XDG_DATA_DIRS" # g_get_system_data_dirs() from GLib
-EOF
-
-echo "Installing GLib schemas"
-# Note: schemasdir is undefined on Ubuntu 16.04
-glib_schemasdir="$(get_pkgconf_variable "schemasdir" "gio-2.0" "/usr/share/glib-2.0/schemas")"
-copy_tree "$glib_schemasdir" "$APPDIR/"
-glib-compile-schemas "$APPDIR/$glib_schemasdir"
-cat >> "$HOOKFILE" <<EOF
-export GSETTINGS_SCHEMA_DIR="\$APPDIR/$glib_schemasdir"
-EOF
-
-case "$DEPLOY_GTK_VERSION" in
-    2)
-        # https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/pull/20#issuecomment-826354261
-        echo "WARNING: Gtk+2 applications are not fully supported by this plugin"
-        ;;
-    3)
-        echo "Installing GTK 3.0 modules"
-        gtk3_exec_prefix="$(get_pkgconf_variable "exec_prefix" "gtk+-3.0")"
-        gtk3_libdir="$(get_pkgconf_variable "libdir" "gtk+-3.0")/gtk-3.0"
-        #gtk3_path="$gtk3_libdir/modules" export GTK_PATH="\$APPDIR/$gtk3_path"
-        gtk3_immodulesdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0")/immodules"
-        gtk3_printbackendsdir="$gtk3_libdir/$(get_pkgconf_variable "gtk_binary_version" "gtk+-3.0")/printbackends"
-        gtk3_immodules_cache_file="$(dirname "$gtk3_immodulesdir")/immodules.cache"
-        gtk3_immodules_query="$(search_tool "gtk-query-immodules-3.0" "libgtk-3-0")"
-        copy_tree "$gtk3_libdir" "$APPDIR/"
-        cat >> "$HOOKFILE" <<EOF
-export GTK_EXE_PREFIX="\$APPDIR/$gtk3_exec_prefix"
-export GTK_PATH="\$APPDIR/$gtk3_libdir:/usr/lib64/gtk-3.0:/usr/lib/x86_64-linux-gnu/gtk-3.0"
-export GTK_IM_MODULE_FILE="\$APPDIR/$gtk3_immodules_cache_file"
-
-EOF
-        if [ -x "$gtk3_immodules_query" ]; then
-            echo "Updating immodules cache in $APPDIR/$gtk3_immodules_cache_file"
-            "$gtk3_immodules_query" > "$APPDIR/$gtk3_immodules_cache_file"
-        else
-            echo "WARNING: gtk-query-immodules-3.0 not found"
-        fi
-        if [ ! -f "$APPDIR/$gtk3_immodules_cache_file" ]; then
-            echo "WARNING: immodules.cache file is missing"
-        fi
-        sed -i "s|$gtk3_libdir/3.0.0/immodules/||g" "$APPDIR/$gtk3_immodules_cache_file"
-        ;;
-    4)
-        echo "Installing GTK 4.0 modules"
-        gtk4_exec_prefix="$(get_pkgconf_variable "exec_prefix" "gtk4" "/usr")"
-        gtk4_libdir="$(get_pkgconf_variable "libdir" "gtk4")/gtk-4.0"
-        gtk4_path="$gtk4_libdir/modules"
-        copy_tree "$gtk4_libdir" "$APPDIR/"
-        cat >> "$HOOKFILE" <<EOF
-export GTK_EXE_PREFIX="\$APPDIR/$gtk4_exec_prefix"
-export GTK_PATH="\$APPDIR/$gtk4_path"
-EOF
-        ;;
-    *)
-        echo "$0: '$DEPLOY_GTK_VERSION' is not a valid GTK major version."
-        echo "Please set DEPLOY_GTK_VERSION to {2, 3, 4}."
-        exit 1
-esac
-
-echo "Installing GDK PixBufs"
-gdk_libdir="$(get_pkgconf_variable "libdir" "gdk-pixbuf-2.0")"
-gdk_pixbuf_binarydir="$(get_pkgconf_variable "gdk_pixbuf_binarydir" "gdk-pixbuf-2.0")"
-gdk_pixbuf_cache_file="$(get_pkgconf_variable "gdk_pixbuf_cache_file" "gdk-pixbuf-2.0")"
-gdk_pixbuf_moduledir="$(get_pkgconf_variable "gdk_pixbuf_moduledir" "gdk-pixbuf-2.0")"
-# Note: gdk_pixbuf_query_loaders variable is not defined on some systems
-gdk_pixbuf_query="$(search_tool "gdk-pixbuf-query-loaders" "gdk-pixbuf-2.0")"
-copy_tree "$gdk_pixbuf_binarydir" "$APPDIR/"
-cat >> "$HOOKFILE" <<EOF
-export GDK_PIXBUF_MODULE_FILE="\$APPDIR/$gdk_pixbuf_cache_file"
-EOF
-if [ -x "$gdk_pixbuf_query" ]; then
-    echo "Updating pixbuf cache in $APPDIR/$gdk_pixbuf_cache_file"
-    "$gdk_pixbuf_query" > "$APPDIR/$gdk_pixbuf_cache_file"
-else
-    echo "WARNING: gdk-pixbuf-query-loaders not found"
-fi
-if [ ! -f "$APPDIR/$gdk_pixbuf_cache_file" ]; then
-    echo "WARNING: loaders.cache file is missing"
-fi
-sed -i "s|$gdk_pixbuf_moduledir/||g" "$APPDIR/$gdk_pixbuf_cache_file"
-
-echo "Copying more libraries"
-gobject_libdir="$(get_pkgconf_variable "libdir" "gobject-2.0")"
-gio_libdir="$(get_pkgconf_variable "libdir" "gio-2.0")"
-librsvg_libdir="$(get_pkgconf_variable "libdir" "librsvg-2.0")"
-pango_libdir="$(get_pkgconf_variable "libdir" "pango")"
-pangocairo_libdir="$(get_pkgconf_variable "libdir" "pangocairo")"
-pangoft2_libdir="$(get_pkgconf_variable "libdir" "pangoft2")"
-FIND_ARRAY=(
-    "$gdk_libdir"     "libgdk_pixbuf-*.so*"
-    "$gobject_libdir" "libgobject-*.so*"
-    "$gio_libdir"     "libgio-*.so*"
-    "$librsvg_libdir" "librsvg-*.so*"
-    "$pango_libdir"      "libpango-*.so*"
-    "$pangocairo_libdir" "libpangocairo-*.so*"
-    "$pangoft2_libdir"   "libpangoft2-*.so*"
-)
-LIBRARIES=()
-for (( i=0; i<${#FIND_ARRAY[@]}; i+=2 )); do
-    directory=${FIND_ARRAY[i]}
-    library=${FIND_ARRAY[i+1]}
-    while IFS= read -r -d '' file; do
-        LIBRARIES+=( "--library=$file" )
-    done < <(find "$directory" \( -type l -o -type f \) -name "$library" -print0)
-done
-
-env LINUXDEPLOY_PLUGIN_MODE=1 "$LINUXDEPLOY" --appdir="$APPDIR" "${LIBRARIES[@]}"
-
-# Create symbolic links as a workaround
-# Details: https://github.com/linuxdeploy/linuxdeploy-plugin-gtk/issues/24#issuecomment-1030026529
-echo "Manually setting rpath for GTK modules"
-PATCH_ARRAY=(
-    "$gtk3_immodulesdir"
-    "$gtk3_printbackendsdir"
-    "$gdk_pixbuf_moduledir"
-)
-for directory in "${PATCH_ARRAY[@]}"; do
-    while IFS= read -r -d '' file; do
-        ln $verbose -s "${file/\/usr\/lib\//}" "$APPDIR/usr/lib"
-    done < <(find "$directory" -name '*.so' -print0)
-done
-
-# set write permission on lib64 again to make it deletable.
-chmod +w "$APPDIR"/usr/lib64 || true
-
-# We have to copy the files first to not get permission errors when we assign gio_extras_dir
-find /usr/lib* -name libgiognutls.so -exec mkdir -p "$APPDIR"/"$(dirname '{}')" \; -exec cp --parents '{}' "$APPDIR/" \; || true
-# related files that we seemingly don't need:
-# libgiolibproxy.so - libgiognomeproxy.so - glib-pacrunner
-
-gio_extras_dir=$(find "$APPDIR"/usr/lib* -name libgiognutls.so -exec dirname '{}' \; 2>/dev/null)
-cat >> "$HOOKFILE" <<EOF
-export GIO_EXTRA_MODULES="\$APPDIR/${gio_extras_dir#"$APPDIR"/}"
-EOF
-
-#binary patch absolute paths in libwebkit files
-find "$APPDIR"/usr/lib* -name 'libwebkit*' -exec sed -i -e "s|/usr|././|g" '{}' \;
-

crates/tauri-bundler/src/bundle/linux/appimage/mod.rs

@@ -3,97 +3,78 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use super::debian;
-use crate::{
-  bundle::settings::Arch,
-  error::{Context, ErrorExt},
-  utils::{fs_utils, http_utils::download, CommandExt},
-  Settings,
+use super::{
+  super::{
+    common::{self, CommandExt},
+    path_utils,
+  },
+  debian,
 };
+use crate::{bundle::settings::Arch, Settings};
+use anyhow::Context;
+use handlebars::Handlebars;
 use std::{
-  fs,
-  path::{Path, PathBuf},
-  process::Command,
+  collections::BTreeMap,
+  fs::{remove_dir_all, write},
+  path::PathBuf,
+  process::{Command, Stdio},
 };
 
 /// Bundles the project.
 /// Returns a vector of PathBuf that shows where the AppImage was created.
 pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   // generate the deb binary name
-  let appimage_arch: &str = match settings.binary_arch() {
+  let arch: &str = match settings.binary_arch() {
     Arch::X86_64 => "amd64",
     Arch::X86 => "i386",
     Arch::AArch64 => "aarch64",
     Arch::Armhf => "armhf",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {target:?}"
+        "Unsupported architecture: {:?}",
+        target
       )));
     }
   };
+  let package_dir = settings.project_out_directory().join("bundle/appimage_deb");
 
-  let tools_arch = if settings.binary_arch() == Arch::Armhf {
-    "armhf"
-  } else {
-    settings.target().split('-').next().unwrap()
-  };
+  // generate deb_folder structure
+  let (data_dir, icons) = debian::generate_data(settings, &package_dir)
+    .with_context(|| "Failed to build data folders and files")?;
+  common::copy_custom_files(&settings.appimage().files, &data_dir)
+    .with_context(|| "Failed to copy custom files")?;
 
   let output_path = settings.project_out_directory().join("bundle/appimage");
   if output_path.exists() {
-    fs::remove_dir_all(&output_path)?;
+    remove_dir_all(&output_path)?;
   }
+  std::fs::create_dir_all(output_path.clone())?;
+  let app_dir_path = output_path.join(format!("{}.AppDir", settings.product_name()));
+  let appimage_filename = format!(
+    "{}_{}_{}.AppImage",
+    settings.product_name(),
+    settings.version_string(),
+    arch
+  );
+  let appimage_path = output_path.join(&appimage_filename);
+  path_utils::create(app_dir_path, true)?;
 
-  let tools_path = settings
+  // setup data to insert into shell script
+  let mut sh_map = BTreeMap::new();
+  sh_map.insert("arch", settings.target().split('-').next().unwrap());
+  sh_map.insert("product_name", settings.product_name());
+  sh_map.insert("appimage_filename", &appimage_filename);
+
+  let tauri_tools_path = settings
     .local_tools_directory()
     .map(|d| d.join(".tauri"))
     .unwrap_or_else(|| {
       dirs::cache_dir().map_or_else(|| output_path.to_path_buf(), |p| p.join("tauri"))
     });
 
-  fs::create_dir_all(&tools_path)?;
-
-  let linuxdeploy_path = prepare_tools(
-    &tools_path,
-    tools_arch,
-    settings.log_level() != log::Level::Error,
-  )?;
-
-  let package_dir = settings.project_out_directory().join("bundle/appimage_deb");
-
-  let main_binary = settings.main_binary()?;
-  let product_name = settings.product_name();
-
-  let mut settings = settings.clone();
-  if main_binary.name().contains(' ') {
-    let main_binary_path = settings.binary_path(main_binary);
-    let project_out_directory = settings.project_out_directory();
-
-    let main_binary_name_kebab = heck::AsKebabCase(main_binary.name()).to_string();
-    let new_path = project_out_directory.join(&main_binary_name_kebab);
-    fs::copy(main_binary_path, new_path)?;
-
-    let main_binary = settings.main_binary_mut()?;
-    main_binary.set_name(main_binary_name_kebab);
-  }
-
-  // generate deb_folder structure
-  let (data_dir, icons) = debian::generate_data(&settings, &package_dir)
-    .with_context(|| "Failed to build data folders and files")?;
-  fs_utils::copy_custom_files(&settings.appimage().files, &data_dir)
-    .with_context(|| "Failed to copy custom files")?;
-
-  fs::create_dir_all(&output_path)?;
-  let app_dir_path = output_path.join(format!("{}.AppDir", settings.product_name()));
-  let appimage_filename = format!(
-    "{}_{}_{}.AppImage",
-    settings.product_name(),
-    settings.version_string(),
-    appimage_arch
-  );
-  let appimage_path = output_path.join(&appimage_filename);
-  fs_utils::create_dir(&app_dir_path, true)?;
-
-  fs::create_dir_all(&tools_path)?;
+  std::fs::create_dir_all(&tauri_tools_path)?;
+  let tauri_tools_path_str = tauri_tools_path.to_string_lossy();
+  sh_map.insert("tauri_tools_path", &tauri_tools_path_str);
   let larger_icon = icons
     .iter()
     .filter(|i| i.width == i.height)
@@ -105,187 +86,39 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     .unwrap()
     .to_string_lossy()
     .to_string();
+  sh_map.insert("icon_path", &larger_icon_path);
+
+  // initialize shell script template.
+  let mut handlebars = Handlebars::new();
+  handlebars.register_escape_fn(handlebars::no_escape);
+  handlebars
+    .register_template_string("appimage", include_str!("./appimage"))
+    .expect("Failed to register template for handlebars");
+  let temp = handlebars.render("appimage", &sh_map)?;
+
+  // create the shell script file in the target/ folder.
+  let sh_file = output_path.join("build_appimage.sh");
 
   log::info!(action = "Bundling"; "{} ({})", appimage_filename, appimage_path.display());
 
-  let app_dir_usr = app_dir_path.join("usr/");
-  let app_dir_usr_bin = app_dir_usr.join("bin/");
-  let app_dir_usr_lib = app_dir_usr.join("lib/");
+  write(&sh_file, temp)?;
 
-  fs_utils::copy_dir(&data_dir.join("usr/"), &app_dir_usr)?;
+  // chmod script for execution
+  Command::new("chmod")
+    .arg("777")
+    .arg(&sh_file)
+    .current_dir(output_path.clone())
+    .stdout(Stdio::piped())
+    .stderr(Stdio::piped())
+    .output()
+    .expect("Failed to chmod script");
 
-  // Using create_dir_all for a single dir so we don't get errors if the path already exists
-  fs::create_dir_all(&app_dir_usr_bin)?;
-  fs::create_dir_all(app_dir_usr_lib)?;
+  // execute the shell script to build the appimage.
+  Command::new(&sh_file)
+    .current_dir(output_path)
+    .output_ok()
+    .context("error running build_appimage.sh")?;
 
-  // Copy bins and libs that linuxdeploy doesn't know about
-
-  // we also check if the user may have provided their own copy already
-  // xdg-open will be handled by the `files` config instead
-  if settings.deep_link_protocols().is_some() && !app_dir_usr_bin.join("xdg-open").exists() {
-    fs::copy("/usr/bin/xdg-mime", app_dir_usr_bin.join("xdg-mime"))
-      .fs_context("xdg-mime binary not found", "/usr/bin/xdg-mime".to_string())?;
-  }
-
-  // we also check if the user may have provided their own copy already
-  if settings.appimage().bundle_xdg_open && !app_dir_usr_bin.join("xdg-open").exists() {
-    fs::copy("/usr/bin/xdg-open", app_dir_usr_bin.join("xdg-open"))
-      .fs_context("xdg-open binary not found", "/usr/bin/xdg-open".to_string())?;
-  }
-
-  let search_dirs = [
-    match settings.binary_arch() {
-      Arch::X86_64 => "/usr/lib/x86_64-linux-gnu/",
-      Arch::X86 => "/usr/lib/i386-linux-gnu/",
-      Arch::AArch64 => "/usr/lib/aarch64-linux-gnu/",
-      Arch::Armhf => "/usr/lib/arm-linux-gnueabihf/",
-      _ => unreachable!(),
-    },
-    "/usr/lib64",
-    "/usr/lib",
-    "/usr/libexec",
-  ];
-
-  for file in [
-    "WebKitNetworkProcess",
-    "WebKitWebProcess",
-    "injected-bundle/libwebkit2gtkinjectedbundle.so",
-  ] {
-    for source in search_dirs.map(PathBuf::from) {
-      // TODO: Check if it's the same dir name on all systems
-      let source = source.join("webkit2gtk-4.1").join(file);
-      if source.exists() {
-        fs_utils::copy_file(
-          &source,
-          &app_dir_path.join(source.strip_prefix("/").unwrap()),
-        )?;
-      }
-    }
-  }
-
-  fs::copy(
-    tools_path.join(format!("AppRun-{tools_arch}")),
-    app_dir_path.join("AppRun"),
-  )?;
-  fs::copy(
-    app_dir_path.join(larger_icon_path),
-    app_dir_path.join(format!("{product_name}.png")),
-  )?;
-  std::os::unix::fs::symlink(
-    app_dir_path.join(format!("{product_name}.png")),
-    app_dir_path.join(".DirIcon"),
-  )?;
-  std::os::unix::fs::symlink(
-    app_dir_path.join(format!("usr/share/applications/{product_name}.desktop")),
-    app_dir_path.join(format!("{product_name}.desktop")),
-  )?;
-
-  let log_level = match settings.log_level() {
-    log::Level::Error => "3",
-    log::Level::Warn => "2",
-    log::Level::Info => "1",
-    _ => "0",
-  };
-
-  let mut cmd = Command::new(linuxdeploy_path);
-  cmd.env("OUTPUT", &appimage_path);
-  cmd.env("ARCH", tools_arch);
-  // Looks like the cli arg isn't enough for the updated AppImage output-plugin.
-  cmd.env("APPIMAGE_EXTRACT_AND_RUN", "1");
-  cmd.args([
-    "--appimage-extract-and-run",
-    "--verbosity",
-    log_level,
-    "--appdir",
-    &app_dir_path.display().to_string(),
-    "--plugin",
-    "gtk",
-  ]);
-  if settings.appimage().bundle_media_framework {
-    cmd.args(["--plugin", "gstreamer"]);
-  }
-  cmd.args(["--output", "appimage"]);
-
-  // Linuxdeploy logs everything into stderr so we have to ignore the output ourselves here
-  if settings.log_level() == log::Level::Error {
-    log::debug!(action = "Running"; "Command `linuxdeploy {}`", cmd.get_args().map(|arg| arg.to_string_lossy()).fold(String::new(), |acc, arg| format!("{acc} {arg}")));
-    if !cmd.output()?.status.success() {
-      return Err(crate::Error::GenericError(
-        "failed to run linuxdeploy".to_string(),
-      ));
-    }
-  } else {
-    cmd.output_ok()?;
-  }
-
-  fs::remove_dir_all(&package_dir)?;
+  remove_dir_all(&package_dir)?;
   Ok(vec![appimage_path])
 }
-
-// returns the linuxdeploy path to keep linuxdeploy_arch contained
-fn prepare_tools(tools_path: &Path, arch: &str, verbose: bool) -> crate::Result<PathBuf> {
-  let apprun = tools_path.join(format!("AppRun-{arch}"));
-  if !apprun.exists() {
-    let data = download(&format!(
-      "https://github.com/tauri-apps/binary-releases/releases/download/apprun-old/AppRun-{arch}"
-    ))?;
-    write_and_make_executable(&apprun, &data)?;
-  }
-
-  let linuxdeploy_arch = if arch == "i686" { "i386" } else { arch };
-  let linuxdeploy = tools_path.join(format!("linuxdeploy-{linuxdeploy_arch}.AppImage"));
-  if !linuxdeploy.exists() {
-    let data = download(&format!("https://github.com/tauri-apps/binary-releases/releases/download/linuxdeploy/linuxdeploy-{linuxdeploy_arch}.AppImage"))?;
-    write_and_make_executable(&linuxdeploy, &data)?;
-  }
-
-  let gtk = tools_path.join("linuxdeploy-plugin-gtk.sh");
-  if !gtk.exists() {
-    let data = include_bytes!("./linuxdeploy-plugin-gtk.sh");
-    write_and_make_executable(&gtk, data)?;
-  }
-
-  let gstreamer = tools_path.join("linuxdeploy-plugin-gstreamer.sh");
-  if !gstreamer.exists() {
-    let data = include_bytes!("./linuxdeploy-plugin-gstreamer.sh");
-    write_and_make_executable(&gstreamer, data)?;
-  }
-
-  let appimage = tools_path.join("linuxdeploy-plugin-appimage.AppImage");
-  if !appimage.exists() {
-    // This is optional, linuxdeploy will fall back to its built-in version if the download failed.
-    let data = download(&format!("https://github.com/linuxdeploy/linuxdeploy-plugin-appimage/releases/download/continuous/linuxdeploy-plugin-appimage-{arch}.AppImage"));
-    match data {
-      Ok(data) => write_and_make_executable(&appimage, &data)?,
-      Err(err) => {
-        log::error!("Download of AppImage plugin failed. Using older built-in version instead.");
-        if verbose {
-          log::debug!("{err:?}");
-        }
-      }
-    }
-  }
-
-  // This should prevent linuxdeploy to be detected by appimage integration tools
-  let _ = Command::new("dd")
-    .args([
-      "if=/dev/zero",
-      "bs=1",
-      "count=3",
-      "seek=8",
-      "conv=notrunc",
-      &format!("of={}", linuxdeploy.display()),
-    ])
-    .output();
-
-  Ok(linuxdeploy)
-}
-
-fn write_and_make_executable(path: &Path, data: &[u8]) -> std::io::Result<()> {
-  use std::os::unix::fs::PermissionsExt;
-
-  fs::write(path, data)?;
-  fs::set_permissions(path, fs::Permissions::from_mode(0o770))?;
-
-  Ok(())
-}

crates/tauri-bundler/src/bundle/linux/debian.rs

@@ -23,13 +23,9 @@
 // metadata, as well as generating the md5sums file.  Currently we do not
 // generate postinst or prerm files.
 
-use super::freedesktop;
-use crate::{
-  bundle::settings::Arch,
-  error::{Context, ErrorExt},
-  utils::fs_utils,
-  Settings,
-};
+use super::{super::common, freedesktop};
+use crate::{bundle::settings::Arch, Settings};
+use anyhow::Context;
 use flate2::{write::GzEncoder, Compression};
 use tar::HeaderMode;
 use walkdir::WalkDir;
@@ -50,10 +46,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     Arch::AArch64 => "arm64",
     Arch::Armhf => "armhf",
     Arch::Armel => "armel",
-    Arch::Riscv64 => "riscv64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {target:?}"
+        "Unsupported architecture: {:?}",
+        target
       )));
     }
   };
@@ -68,32 +64,30 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   let base_dir = settings.project_out_directory().join("bundle/deb");
   let package_dir = base_dir.join(&package_base_name);
   if package_dir.exists() {
-    fs::remove_dir_all(&package_dir).fs_context(
-      "Failed to Remove old package directory",
-      package_dir.clone(),
-    )?;
+    fs::remove_dir_all(&package_dir)
+      .with_context(|| format!("Failed to remove old {package_base_name}"))?;
   }
   let package_path = base_dir.join(&package_name);
 
   log::info!(action = "Bundling"; "{} ({})", package_name, package_path.display());
 
-  let (data_dir, _) =
-    generate_data(settings, &package_dir).context("Failed to build data folders and files")?;
-  fs_utils::copy_custom_files(&settings.deb().files, &data_dir)
-    .context("Failed to copy custom files")?;
+  let (data_dir, _) = generate_data(settings, &package_dir)
+    .with_context(|| "Failed to build data folders and files")?;
+  common::copy_custom_files(&settings.deb().files, &data_dir)
+    .with_context(|| "Failed to copy custom files")?;
 
   // Generate control files.
   let control_dir = package_dir.join("control");
   generate_control_file(settings, arch, &control_dir, &data_dir)
-    .context("Failed to create control file")?;
-  generate_scripts(settings, &control_dir).context("Failed to create control scripts")?;
-  generate_md5sums(&control_dir, &data_dir).context("Failed to create md5sums file")?;
+    .with_context(|| "Failed to create control file")?;
+  generate_scripts(settings, &control_dir).with_context(|| "Failed to create control scripts")?;
+  generate_md5sums(&control_dir, &data_dir).with_context(|| "Failed to create md5sums file")?;
 
   // Generate `debian-binary` file; see
   // http://www.tldp.org/HOWTO/Debian-Binary-Package-Building-HOWTO/x60.html#AEN66
   let debian_binary_path = package_dir.join("debian-binary");
   create_file_with_data(&debian_binary_path, "2.0\n")
-    .context("Failed to create debian-binary file")?;
+    .with_context(|| "Failed to create debian-binary file")?;
 
   // Apply tar/gzip/ar to create the final package file.
   let control_tar_gz_path =
@@ -119,9 +113,8 @@ pub fn generate_data(
 
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
-    let trgt = bin_dir.join(bin.name());
-    fs_utils::copy_file(&bin_path, &trgt)
-      .with_context(|| format!("Failed to copy binary from {bin_path:?} to {trgt:?}"))?;
+    common::copy_file(&bin_path, bin_dir.join(bin.name()))
+      .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
   }
 
   copy_resource_files(settings, &data_dir).with_context(|| "Failed to copy resource files")?;
@@ -148,7 +141,7 @@ fn generate_changelog_file(settings: &Settings, data_dir: &Path) -> crate::Resul
     let product_name = settings.product_name();
     let dest_path = data_dir.join(format!("usr/share/doc/{product_name}/changelog.gz"));
 
-    let changelog_file = fs_utils::create_file(&dest_path)?;
+    let changelog_file = common::create_file(&dest_path)?;
     let mut gzip_encoder = GzEncoder::new(changelog_file, Compression::new(9));
     io::copy(&mut src_file, &mut gzip_encoder)?;
 
@@ -168,9 +161,9 @@ fn generate_control_file(
   // For more information about the format of this file, see
   // https://www.debian.org/doc/debian-policy/ch-controlfields.html
   let dest_path = control_dir.join("control");
-  let mut file = fs_utils::create_file(&dest_path)?;
+  let mut file = common::create_file(&dest_path)?;
   let package = heck::AsKebabCase(settings.product_name());
-  writeln!(file, "Package: {package}")?;
+  writeln!(file, "Package: {}", package)?;
   writeln!(file, "Version: {}", settings.version_string())?;
   writeln!(file, "Architecture: {arch}")?;
   // Installed-Size must be divided by 1024, see https://www.debian.org/doc/debian-policy/ch-controlfields.html#installed-size
@@ -189,31 +182,22 @@ fn generate_control_file(
 
   writeln!(file, "Maintainer: {authors}")?;
   if let Some(section) = &settings.deb().section {
-    writeln!(file, "Section: {section}")?;
+    writeln!(file, "Section: {}", section)?;
   }
   if let Some(priority) = &settings.deb().priority {
-    writeln!(file, "Priority: {priority}")?;
+    writeln!(file, "Priority: {}", priority)?;
   } else {
     writeln!(file, "Priority: optional")?;
   }
 
   if let Some(homepage) = settings.homepage_url() {
-    writeln!(file, "Homepage: {homepage}")?;
+    writeln!(file, "Homepage: {}", homepage)?;
   }
 
   let dependencies = settings.deb().depends.as_ref().cloned().unwrap_or_default();
   if !dependencies.is_empty() {
     writeln!(file, "Depends: {}", dependencies.join(", "))?;
   }
-  let dependencies = settings
-    .deb()
-    .recommends
-    .as_ref()
-    .cloned()
-    .unwrap_or_default();
-  if !dependencies.is_empty() {
-    writeln!(file, "Recommends: {}", dependencies.join(", "))?;
-  }
   let provides = settings
     .deb()
     .provides
@@ -301,7 +285,7 @@ fn create_script_file_from_path(from: &PathBuf, to: &PathBuf) -> crate::Result<(
 /// for each file within the `data_dir`.
 fn generate_md5sums(control_dir: &Path, data_dir: &Path) -> crate::Result<()> {
   let md5sums_path = control_dir.join("md5sums");
-  let mut md5sums_file = fs_utils::create_file(&md5sums_path)?;
+  let mut md5sums_file = common::create_file(&md5sums_path)?;
   for entry in WalkDir::new(data_dir) {
     let entry = entry?;
     let path = entry.path();
@@ -311,7 +295,7 @@ fn generate_md5sums(control_dir: &Path, data_dir: &Path) -> crate::Result<()> {
     let mut file = File::open(path)?;
     let mut hash = md5::Context::new();
     io::copy(&mut file, &mut hash)?;
-    for byte in hash.finalize().iter() {
+    for byte in hash.compute().iter() {
       write!(md5sums_file, "{byte:02x}")?;
     }
     let rel_path = path.strip_prefix(data_dir)?;
@@ -334,7 +318,7 @@ fn copy_resource_files(settings: &Settings, data_dir: &Path) -> crate::Result<()
 /// Create an empty file at the given path, creating any parent directories as
 /// needed, then write `data` into the file.
 fn create_file_with_data<P: AsRef<Path>>(path: P, data: &str) -> crate::Result<()> {
-  let mut file = fs_utils::create_file(path.as_ref())?;
+  let mut file = common::create_file(path.as_ref())?;
   file.write_all(data.as_bytes())?;
   file.flush()?;
   Ok(())
@@ -383,7 +367,7 @@ fn create_tar_from_dir<P: AsRef<Path>, W: Write>(src_dir: P, dest_file: W) -> cr
 fn tar_and_gzip_dir<P: AsRef<Path>>(src_dir: P) -> crate::Result<PathBuf> {
   let src_dir = src_dir.as_ref();
   let dest_path = src_dir.with_extension("tar.gz");
-  let dest_file = fs_utils::create_file(&dest_path)?;
+  let dest_file = common::create_file(&dest_path)?;
   let gzip_encoder = GzEncoder::new(dest_file, Compression::default());
   let gzip_encoder = create_tar_from_dir(src_dir, gzip_encoder)?;
   let mut dest_file = gzip_encoder.finish()?;
@@ -394,7 +378,7 @@ fn tar_and_gzip_dir<P: AsRef<Path>>(src_dir: P) -> crate::Result<PathBuf> {
 /// Creates an `ar` archive from the given source files and writes it to the
 /// given destination path.
 fn create_archive(srcs: Vec<PathBuf>, dest: &Path) -> crate::Result<()> {
-  let mut builder = ar::Builder::new(fs_utils::create_file(dest)?);
+  let mut builder = ar::Builder::new(common::create_file(dest)?);
   for path in &srcs {
     builder.append_path(path)?;
   }

crates/tauri-bundler/src/bundle/linux/freedesktop/main.desktop

@@ -4,7 +4,6 @@ Categories={{categories}}
 Comment={{comment}}
 {{/if}}
 Exec={{exec}}
-StartupWMClass={{exec}}
 Icon={{icon}}
 Name={{name}}
 Terminal=false

crates/tauri-bundler/src/bundle/linux/freedesktop/mod.rs

@@ -21,15 +21,13 @@ use std::fs::{read_to_string, File};
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 
+use anyhow::Context;
 use handlebars::Handlebars;
 use image::{self, codecs::png::PngDecoder, ImageDecoder};
 use serde::Serialize;
 
-use crate::{
-  error::Context,
-  utils::{self, fs_utils},
-  Settings,
-};
+use crate::bundle::common;
+use crate::Settings;
 
 #[derive(PartialEq, Eq, PartialOrd, Ord)]
 pub struct Icon {
@@ -67,7 +65,7 @@ pub fn list_icon_files(
       let decoder = PngDecoder::new(BufReader::new(File::open(&icon_path)?))?;
       let width = decoder.dimensions().0;
       let height = decoder.dimensions().1;
-      let is_high_density = utils::is_retina(&icon_path);
+      let is_high_density = common::is_retina(&icon_path);
       let dest_path = get_dest_path(width, height, is_high_density);
       Icon {
         width,
@@ -86,7 +84,7 @@ pub fn list_icon_files(
 pub fn copy_icon_files(settings: &Settings, data_dir: &Path) -> crate::Result<Vec<Icon>> {
   let icons = list_icon_files(settings, data_dir)?;
   for (icon, src) in &icons {
-    fs_utils::copy_file(src, &icon.path)?;
+    common::copy_file(src, &icon.path)?;
   }
 
   Ok(icons.into_keys().collect())
@@ -101,26 +99,23 @@ pub fn generate_desktop_file(
   data_dir: &Path,
 ) -> crate::Result<(PathBuf, PathBuf)> {
   let bin_name = settings.main_binary_name()?;
-
   let product_name = settings.product_name();
   let desktop_file_name = format!("{product_name}.desktop");
   let path = PathBuf::from("usr/share/applications").join(desktop_file_name);
   let dest_path = PathBuf::from("/").join(&path);
   let file_path = data_dir.join(&path);
-  let file = &mut fs_utils::create_file(&file_path)?;
+  let file = &mut common::create_file(&file_path)?;
 
   let mut handlebars = Handlebars::new();
   handlebars.register_escape_fn(handlebars::no_escape);
   if let Some(template) = custom_template_path {
     handlebars
       .register_template_string("main.desktop", read_to_string(template)?)
-      .map_err(Into::into)
-      .context("Failed to setup custom handlebar template")?;
+      .with_context(|| "Failed to setup custom handlebar template")?;
   } else {
     handlebars
       .register_template_string("main.desktop", include_str!("./main.desktop"))
-      .map_err(Into::into)
-      .context("Failed to setup default handlebar template")?;
+      .with_context(|| "Failed to setup default handlebar template")?;
   }
 
   #[derive(Serialize)]
@@ -155,12 +150,6 @@ pub fn generate_desktop_file(
 
   let mime_type = (!mime_type.is_empty()).then_some(mime_type.join(";"));
 
-  let bin_name_exec = if bin_name.contains(' ') {
-    format!("\"{bin_name}\"")
-  } else {
-    bin_name.to_string()
-  };
-
   handlebars.render_to_write(
     "main.desktop",
     &DesktopTemplateParams {
@@ -173,7 +162,7 @@ pub fn generate_desktop_file(
       } else {
         None
       },
-      exec: &bin_name_exec,
+      exec: bin_name,
       icon: bin_name,
       name: settings.product_name(),
       mime_type,

crates/tauri-bundler/src/bundle/linux/rpm.rs

@@ -3,15 +3,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::{bundle::settings::Arch, error::ErrorExt, Settings};
+use crate::{bundle::settings::Arch, Settings};
 
+use anyhow::Context;
 use rpm::{self, signature::pgp, Dependency, FileMode, FileOptions};
 use std::{
   env,
   fs::{self, File},
   path::{Path, PathBuf},
 };
-use tauri_utils::config::RpmCompression;
 
 use super::freedesktop;
 
@@ -20,10 +20,7 @@ use super::freedesktop;
 pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   let product_name = settings.product_name();
   let version = settings.version_string();
-  let release = match settings.rpm().release.as_str() {
-    "" => "1", // Considered the default. If left empty, you get file with "-.".
-    v => v,
-  };
+  let release = settings.rpm().release.as_str();
   let epoch = settings.rpm().epoch;
   let arch = match settings.binary_arch() {
     Arch::X86_64 => "x86_64",
@@ -31,10 +28,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     Arch::AArch64 => "aarch64",
     Arch::Armhf => "armhfp",
     Arch::Armel => "armel",
-    Arch::Riscv64 => "riscv64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {target:?}"
+        "Unsupported architecture: {:?}",
+        target
       )));
     }
   };
@@ -47,38 +44,21 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
   let base_dir = settings.project_out_directory().join("bundle/rpm");
   let package_dir = base_dir.join(&package_base_name);
   if package_dir.exists() {
-    fs::remove_dir_all(&package_dir).fs_context(
-      "Failed to remove old package directory",
-      package_dir.clone(),
-    )?;
+    fs::remove_dir_all(&package_dir)
+      .with_context(|| format!("Failed to remove old {package_base_name}"))?;
   }
-  fs::create_dir_all(&package_dir)
-    .fs_context("Failed to create package directory", package_dir.clone())?;
+  fs::create_dir_all(&package_dir)?;
   let package_path = base_dir.join(&package_name);
 
   log::info!(action = "Bundling"; "{} ({})", package_name, package_path.display());
 
   let license = settings.license().unwrap_or_default();
   let name = heck::AsKebabCase(settings.product_name()).to_string();
-
-  let compression = settings
-    .rpm()
-    .compression
-    .map(|c| match c {
-      RpmCompression::Gzip { level } => rpm::CompressionWithLevel::Gzip(level),
-      RpmCompression::Zstd { level } => rpm::CompressionWithLevel::Zstd(level),
-      RpmCompression::Xz { level } => rpm::CompressionWithLevel::Xz(level),
-      RpmCompression::Bzip2 { level } => rpm::CompressionWithLevel::Bzip2(level),
-      _ => rpm::CompressionWithLevel::None,
-    })
-    // This matches .deb compression. On a 240MB source binary the bundle will be 100KB larger than rpm's default while reducing build times by ~25%.
-    // TODO: Default to Zstd in v3 to match rpm-rs new default in 0.16
-    .unwrap_or(rpm::CompressionWithLevel::Gzip(6));
-
   let mut builder = rpm::PackageBuilder::new(&name, version, &license, arch, summary)
     .epoch(epoch)
     .release(release)
-    .compression(compression);
+    // This matches .deb compression. On a 240MB source binary the bundle will be 100KB larger than rpm's default while reducing build times by ~25%.
+    .compression(rpm::CompressionWithLevel::Gzip(6));
 
   if let Some(description) = settings.long_description() {
     builder = builder.description(description);
@@ -104,17 +84,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     builder = builder.provides(Dependency::any(dep));
   }
 
-  // Add recommends
-  for dep in settings
-    .rpm()
-    .recommends
-    .as_ref()
-    .cloned()
-    .unwrap_or_default()
-  {
-    builder = builder.recommends(Dependency::any(dep));
-  }
-
   // Add conflicts
   for dep in settings
     .rpm()
@@ -191,10 +160,10 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
       FileOptions::new(resource_dir.to_string_lossy()).mode(FileMode::Dir { permissions: 0o755 }),
     )?;
     // Then add the resources files in that directory
-    for resource in settings.resource_files().iter() {
-      let resource = resource?;
-      let dest = resource_dir.join(resource.target());
-      builder = builder.with_file(resource.path(), FileOptions::new(dest.to_string_lossy()))?;
+    for src in settings.resource_files() {
+      let src = src?;
+      let dest = resource_dir.join(tauri_utils::resources::resource_relpath(&src));
+      builder = builder.with_file(&src, FileOptions::new(dest.to_string_lossy()))?;
     }
   }
 
@@ -239,5 +208,6 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   let mut f = fs::File::create(&package_path)?;
   pkg.write(&mut f)?;
+
   Ok(vec![package_path])
 }

crates/tauri-bundler/src/bundle/macos/app.rs

@@ -23,16 +23,13 @@
 // files into the `Contents` directory of the bundle.
 
 use super::{
+  super::common::{self, CommandExt},
   icon::create_icns_file,
-  sign::{notarize, notarize_auth, notarize_without_stapling, sign, SignTarget},
-};
-use crate::{
-  bundle::settings::PlistKind,
-  error::{Context, ErrorExt, NotarizeAuthError},
-  utils::{fs_utils, CommandExt},
-  Error::GenericError,
-  Settings,
+  sign::{notarize, notarize_auth, sign, NotarizeAuthError, SignTarget},
 };
+use crate::Settings;
+
+use anyhow::Context;
 
 use std::{
   ffi::OsStr,
@@ -66,11 +63,15 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   if app_bundle_path.exists() {
     fs::remove_dir_all(&app_bundle_path)
-      .fs_context("failed to remove old app bundle", &app_bundle_path)?;
+      .with_context(|| format!("Failed to remove old {}", app_product_name))?;
   }
   let bundle_directory = app_bundle_path.join("Contents");
-  fs::create_dir_all(&bundle_directory)
-    .fs_context("failed to create bundle directory", &bundle_directory)?;
+  fs::create_dir_all(&bundle_directory).with_context(|| {
+    format!(
+      "Failed to create bundle directory at {:?}",
+      bundle_directory
+    )
+  })?;
 
   let resources_dir = bundle_directory.join("Resources");
   let bin_dir = bundle_directory.join("MacOS");
@@ -104,11 +105,7 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   copy_custom_files_to_bundle(&bundle_directory, settings)?;
 
-  if settings.no_sign() {
-    log::warn!("Skipping signing due to --no-sign flag.",);
-  } else if let Some(keychain) =
-    super::sign::keychain(settings.macos().signing_identity.as_deref())?
-  {
+  if let Some(keychain) = super::sign::keychain(settings.macos().signing_identity.as_deref())? {
     // Sign frameworks and sidecar binaries first, per apple, signing must be done inside out
     // https://developer.apple.com/forums/thread/701514
     sign_paths.push(SignTarget {
@@ -126,15 +123,11 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
     // notarization is required for distribution
     match notarize_auth() {
       Ok(auth) => {
-        if settings.macos().skip_stapling {
-          notarize_without_stapling(&keychain, app_bundle_path.clone(), &auth)?;
-        } else {
-          notarize(&keychain, app_bundle_path.clone(), &auth)?;
-        }
+        notarize(&keychain, app_bundle_path.clone(), &auth)?;
       }
       Err(e) => {
         if matches!(e, NotarizeAuthError::MissingTeamId) {
-          return Err(e.into());
+          return Err(anyhow::anyhow!("{e}").into());
         } else {
           log::warn!("skipping app notarization, {}", e.to_string());
         }
@@ -164,8 +157,8 @@ fn copy_binaries_to_bundle(
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
     let dest_path = dest_dir.join(bin.name());
-    fs_utils::copy_file(&bin_path, &dest_path)
-      .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
+    common::copy_file(&bin_path, &dest_path)
+      .with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
     paths.push(dest_path);
   }
   Ok(paths)
@@ -174,27 +167,17 @@ fn copy_binaries_to_bundle(
 /// Copies user-defined files to the app under Contents.
 fn copy_custom_files_to_bundle(bundle_directory: &Path, settings: &Settings) -> crate::Result<()> {
   for (contents_path, path) in settings.macos().files.iter() {
-    if !path.try_exists()? {
-      return Err(GenericError(format!(
-        "Failed to copy {path:?} to {contents_path:?}. {path:?} does not exist."
-      )));
-    }
-
     let contents_path = if contents_path.is_absolute() {
       contents_path.strip_prefix("/").unwrap()
     } else {
       contents_path
     };
     if path.is_file() {
-      fs_utils::copy_file(path, &bundle_directory.join(contents_path))
-        .with_context(|| format!("Failed to copy file {path:?} to {contents_path:?}"))?;
-    } else if path.is_dir() {
-      fs_utils::copy_dir(path, &bundle_directory.join(contents_path))
-        .with_context(|| format!("Failed to copy directory {path:?} to {contents_path:?}"))?;
+      common::copy_file(path, bundle_directory.join(contents_path))
+        .with_context(|| format!("Failed to copy file {:?} to {:?}", path, contents_path))?;
     } else {
-      return Err(GenericError(format!(
-        "{path:?} is not a file or directory."
-      )));
+      common::copy_dir(path, &bundle_directory.join(contents_path))
+        .with_context(|| format!("Failed to copy directory {:?} to {:?}", path, contents_path))?;
     }
   }
   Ok(())
@@ -206,6 +189,12 @@ fn create_info_plist(
   bundle_icon_file: Option<PathBuf>,
   settings: &Settings,
 ) -> crate::Result<()> {
+  let format = time::format_description::parse("[year][month][day].[hour][minute][second]")
+    .map_err(time::error::Error::from)?;
+  let build_number = time::OffsetDateTime::now_utc()
+    .format(&format)
+    .map_err(time::error::Error::from)?;
+
   let mut plist = plist::Dictionary::new();
   plist.insert("CFBundleDevelopmentRegion".into(), "English".into());
   plist.insert("CFBundleDisplayName".into(), settings.product_name().into());
@@ -229,29 +218,13 @@ fn create_info_plist(
     settings.bundle_identifier().into(),
   );
   plist.insert("CFBundleInfoDictionaryVersion".into(), "6.0".into());
-  if let Some(bundle_name) = settings
-    .macos()
-    .bundle_name
-    .as_deref()
-    .unwrap_or_else(|| settings.product_name())
-    .into()
-  {
-    plist.insert("CFBundleName".into(), bundle_name.into());
-  }
+  plist.insert("CFBundleName".into(), settings.product_name().into());
   plist.insert("CFBundlePackageType".into(), "APPL".into());
   plist.insert(
     "CFBundleShortVersionString".into(),
     settings.version_string().into(),
   );
-  plist.insert(
-    "CFBundleVersion".into(),
-    settings
-      .macos()
-      .bundle_version
-      .as_deref()
-      .unwrap_or_else(|| settings.version_string())
-      .into(),
-  );
+  plist.insert("CFBundleVersion".into(), build_number.into());
   plist.insert("CSResourcesFileMapped".into(), true.into());
   if let Some(category) = settings.app_category() {
     plist.insert(
@@ -264,55 +237,6 @@ fn create_info_plist(
   }
 
   if let Some(associations) = settings.file_associations() {
-    let exported_associations = associations
-      .iter()
-      .filter_map(|association| {
-        association.exported_type.as_ref().map(|exported_type| {
-          let mut dict = plist::Dictionary::new();
-
-          dict.insert(
-            "UTTypeIdentifier".into(),
-            exported_type.identifier.clone().into(),
-          );
-          if let Some(description) = &association.description {
-            dict.insert("UTTypeDescription".into(), description.clone().into());
-          }
-          if let Some(conforms_to) = &exported_type.conforms_to {
-            dict.insert(
-              "UTTypeConformsTo".into(),
-              plist::Value::Array(conforms_to.iter().map(|s| s.clone().into()).collect()),
-            );
-          }
-
-          let mut specification = plist::Dictionary::new();
-          specification.insert(
-            "public.filename-extension".into(),
-            plist::Value::Array(
-              association
-                .ext
-                .iter()
-                .map(|s| s.to_string().into())
-                .collect(),
-            ),
-          );
-          if let Some(mime_type) = &association.mime_type {
-            specification.insert("public.mime-type".into(), mime_type.clone().into());
-          }
-
-          dict.insert("UTTypeTagSpecification".into(), specification.into());
-
-          plist::Value::Dictionary(dict)
-        })
-      })
-      .collect::<Vec<_>>();
-
-    if !exported_associations.is_empty() {
-      plist.insert(
-        "UTExportedTypeDeclarations".into(),
-        plist::Value::Array(exported_associations),
-      );
-    }
-
     plist.insert(
       "CFBundleDocumentTypes".into(),
       plist::Value::Array(
@@ -320,27 +244,16 @@ fn create_info_plist(
           .iter()
           .map(|association| {
             let mut dict = plist::Dictionary::new();
-
-            if !association.ext.is_empty() {
-              dict.insert(
-                "CFBundleTypeExtensions".into(),
-                plist::Value::Array(
-                  association
-                    .ext
-                    .iter()
-                    .map(|ext| ext.to_string().into())
-                    .collect(),
-                ),
-              );
-            }
-
-            if let Some(content_types) = &association.content_types {
-              dict.insert(
-                "LSItemContentTypes".into(),
-                plist::Value::Array(content_types.iter().map(|s| s.to_string().into()).collect()),
-              );
-            }
-
+            dict.insert(
+              "CFBundleTypeExtensions".into(),
+              plist::Value::Array(
+                association
+                  .ext
+                  .iter()
+                  .map(|ext| ext.to_string().into())
+                  .collect(),
+              ),
+            );
             dict.insert(
               "CFBundleTypeName".into(),
               association
@@ -354,7 +267,6 @@ fn create_info_plist(
               "CFBundleTypeRole".into(),
               association.role.to_string().into(),
             );
-            dict.insert("LSHandlerRank".into(), association.rank.to_string().into());
             plist::Value::Dictionary(dict)
           })
           .collect(),
@@ -368,7 +280,6 @@ fn create_info_plist(
       plist::Value::Array(
         protocols
           .iter()
-          .filter(|p| !p.schemes.is_empty())
           .map(|protocol| {
             let mut dict = plist::Dictionary::new();
             dict.insert(
@@ -419,11 +330,8 @@ fn create_info_plist(
     plist.insert("NSAppTransportSecurity".into(), security.into());
   }
 
-  if let Some(user_plist) = &settings.macos().info_plist {
-    let user_plist = match user_plist {
-      PlistKind::Path(path) => plist::Value::from_file(path)?,
-      PlistKind::Plist(value) => value.clone(),
-    };
+  if let Some(user_plist_path) = &settings.macos().info_plist_path {
+    let user_plist = plist::Value::from_file(user_plist_path)?;
     if let Some(dict) = user_plist.into_dictionary() {
       for (key, value) in dict {
         plist.insert(key, value);
@@ -438,10 +346,10 @@ fn create_info_plist(
 
 // Copies the framework under `{src_dir}/{framework}.framework` to `{dest_dir}/{framework}.framework`.
 fn copy_framework_from(dest_dir: &Path, framework: &str, src_dir: &Path) -> crate::Result<bool> {
-  let src_name = format!("{framework}.framework");
+  let src_name = format!("{}.framework", framework);
   let src_path = src_dir.join(&src_name);
   if src_path.exists() {
-    fs_utils::copy_dir(&src_path, &dest_dir.join(&src_name))?;
+    common::copy_dir(&src_path, &dest_dir.join(&src_name))?;
     Ok(true)
   } else {
     Ok(false)
@@ -455,12 +363,18 @@ fn copy_frameworks_to_bundle(
 ) -> crate::Result<Vec<SignTarget>> {
   let mut paths = Vec::new();
 
-  let frameworks = settings.macos().frameworks.clone().unwrap_or_default();
+  let frameworks = settings
+    .macos()
+    .frameworks
+    .as_ref()
+    .cloned()
+    .unwrap_or_default();
   if frameworks.is_empty() {
     return Ok(paths);
   }
   let dest_dir = bundle_directory.join("Frameworks");
-  fs::create_dir_all(&dest_dir).fs_context("failed to create Frameworks directory", &dest_dir)?;
+  fs::create_dir_all(bundle_directory)
+    .with_context(|| format!("Failed to create Frameworks directory at {:?}", dest_dir))?;
   for framework in frameworks.iter() {
     if framework.ends_with(".framework") {
       let src_path = PathBuf::from(framework);
@@ -468,25 +382,29 @@ fn copy_frameworks_to_bundle(
         .file_name()
         .expect("Couldn't get framework filename");
       let dest_path = dest_dir.join(src_name);
-      fs_utils::copy_dir(&src_path, &dest_path)?;
+      common::copy_dir(&src_path, &dest_path)?;
       add_framework_sign_path(&src_path, &dest_path, &mut paths);
       continue;
     } else if framework.ends_with(".dylib") {
       let src_path = PathBuf::from(framework);
       if !src_path.exists() {
-        return Err(GenericError(format!("Library not found: {framework}")));
+        return Err(crate::Error::GenericError(format!(
+          "Library not found: {}",
+          framework
+        )));
       }
       let src_name = src_path.file_name().expect("Couldn't get library filename");
       let dest_path = dest_dir.join(src_name);
-      fs_utils::copy_file(&src_path, &dest_path)?;
+      common::copy_file(&src_path, &dest_path)?;
       paths.push(SignTarget {
         path: dest_path,
         is_an_executable: false,
       });
       continue;
     } else if framework.contains('/') {
-      return Err(GenericError(format!(
-        "Framework path should have .framework extension: {framework}"
+      return Err(crate::Error::GenericError(format!(
+        "Framework path should have .framework extension: {}",
+        framework
       )));
     }
     if let Some(home_dir) = dirs::home_dir() {
@@ -503,8 +421,9 @@ fn copy_frameworks_to_bundle(
     {
       continue;
     }
-    return Err(GenericError(format!(
-      "Could not locate framework: {framework}"
+    return Err(crate::Error::GenericError(format!(
+      "Could not locate framework: {}",
+      framework
     )));
   }
   Ok(paths)
@@ -596,153 +515,3 @@ fn add_nested_code_sign_path(src_path: &Path, dest_path: &Path, sign_paths: &mut
     }
   }
 }
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-  use crate::bundle::{BundleSettings, MacOsSettings, PackageSettings, SettingsBuilder};
-  use std::{
-    collections::HashMap,
-    fs,
-    path::{Path, PathBuf},
-  };
-
-  /// Helper that builds a `Settings` instance and bundle directory for tests.
-  /// It receives a mapping of bundle-relative paths to source paths and
-  /// returns the generated bundle directory and settings.
-  fn create_test_bundle(
-    project_dir: &Path,
-    files: HashMap<PathBuf, PathBuf>,
-  ) -> (PathBuf, crate::bundle::Settings) {
-    let macos_settings = MacOsSettings {
-      files,
-      ..Default::default()
-    };
-
-    let settings = SettingsBuilder::new()
-      .project_out_directory(project_dir)
-      .package_settings(PackageSettings {
-        product_name: "TestApp".into(),
-        version: "0.1.0".into(),
-        description: "test".into(),
-        homepage: None,
-        authors: None,
-        default_run: None,
-      })
-      .bundle_settings(BundleSettings {
-        macos: macos_settings,
-        ..Default::default()
-      })
-      .target("x86_64-apple-darwin".into())
-      .build()
-      .expect("failed to build settings");
-
-    let bundle_dir = project_dir.join("TestApp.app/Contents");
-    fs::create_dir_all(&bundle_dir).expect("failed to create bundle dir");
-
-    (bundle_dir, settings)
-  }
-
-  #[test]
-  fn test_copy_custom_file_to_bundle_file() {
-    let tmp_dir = tempfile::tempdir().expect("failed to create temp dir");
-
-    // Prepare a single file to copy.
-    let src_file = tmp_dir.path().join("sample.txt");
-    fs::write(&src_file, b"hello tauri").expect("failed to write sample file");
-
-    let files_map = HashMap::from([(PathBuf::from("Resources/sample.txt"), src_file.clone())]);
-
-    let (bundle_dir, settings) = create_test_bundle(tmp_dir.path(), files_map);
-
-    copy_custom_files_to_bundle(&bundle_dir, &settings)
-      .expect("copy_custom_files_to_bundle failed");
-
-    let dest_file = bundle_dir.join("Resources/sample.txt");
-    assert!(dest_file.exists() && dest_file.is_file());
-    assert_eq!(fs::read_to_string(dest_file).unwrap(), "hello tauri");
-  }
-
-  #[test]
-  fn test_copy_custom_file_to_bundle_dir() {
-    let tmp_dir = tempfile::tempdir().expect("failed to create temp dir");
-
-    // Create a source directory with a nested file.
-    let src_dir = tmp_dir.path().join("assets");
-    fs::create_dir_all(&src_dir).expect("failed to create assets directory");
-    let nested_file = src_dir.join("nested.txt");
-    fs::write(&nested_file, b"nested").expect("failed to write nested file");
-
-    let files_map = HashMap::from([(PathBuf::from("MyAssets"), src_dir.clone())]);
-
-    let (bundle_dir, settings) = create_test_bundle(tmp_dir.path(), files_map);
-
-    copy_custom_files_to_bundle(&bundle_dir, &settings)
-      .expect("copy_custom_files_to_bundle failed");
-
-    let dest_nested_file = bundle_dir.join("MyAssets/nested.txt");
-    assert!(
-      dest_nested_file.exists(),
-      "{dest_nested_file:?} does not exist"
-    );
-    assert!(
-      dest_nested_file.is_file(),
-      "{dest_nested_file:?} is not a file"
-    );
-    assert_eq!(
-      fs::read_to_string(dest_nested_file).unwrap().trim(),
-      "nested"
-    );
-  }
-
-  #[test]
-  fn test_copy_custom_files_to_bundle_missing_source() {
-    let tmp_dir = tempfile::tempdir().expect("failed to create temp dir");
-
-    // Intentionally reference a non-existent path.
-    let missing_path = tmp_dir.path().join("does_not_exist.txt");
-
-    let files_map = HashMap::from([(PathBuf::from("Missing.txt"), missing_path)]);
-
-    let (bundle_dir, settings) = create_test_bundle(tmp_dir.path(), files_map);
-
-    let result = copy_custom_files_to_bundle(&bundle_dir, &settings);
-
-    assert!(result.is_err());
-    assert!(result.err().unwrap().to_string().contains("does not exist"));
-  }
-
-  #[test]
-  fn test_copy_custom_files_to_bundle_invalid_source() {
-    let tmp_dir = tempfile::tempdir().expect("failed to create temp dir");
-
-    let files_map = HashMap::from([(PathBuf::from("Invalid.txt"), PathBuf::from("///"))]);
-
-    let (bundle_dir, settings) = create_test_bundle(tmp_dir.path(), files_map);
-
-    let result = copy_custom_files_to_bundle(&bundle_dir, &settings);
-    assert!(result.is_err());
-    assert!(result
-      .err()
-      .unwrap()
-      .to_string()
-      .contains("Failed to copy directory"));
-  }
-
-  #[test]
-  fn test_copy_custom_files_to_bundle_dev_null() {
-    let tmp_dir = tempfile::tempdir().expect("failed to create temp dir");
-
-    let files_map = HashMap::from([(PathBuf::from("Invalid.txt"), PathBuf::from("/dev/null"))]);
-
-    let (bundle_dir, settings) = create_test_bundle(tmp_dir.path(), files_map);
-
-    let result = copy_custom_files_to_bundle(&bundle_dir, &settings);
-    assert!(result.is_err());
-    assert!(result
-      .err()
-      .unwrap()
-      .to_string()
-      .contains("is not a file or directory."));
-  }
-}

crates/tauri-bundler/src/bundle/macos/dmg/bundle_dmg

@@ -4,63 +4,13 @@
 # SPDX-License-Identifier: MIT
 
 # Create a read-only disk image of the contents of a folder
-# forked from https://github.com/create-dmg/create-dmg
+# forked from https://github.com/andreyvit/create-dmg
 
 # Bail out on any unhandled errors
-set -e;
-# Any command that exits with non-zero code will cause the pipeline to fail
-set -o pipefail;
-
-CDMG_VERSION='1.2.1'
-
-# The full path to the "support/" directory this script is using
-# (This will be set up by code later in the script.)
-CDMG_SUPPORT_DIR=""
-
-OS_FULL_VERSION="$(sw_vers | sed -n 2p | cut -d : -f 2 | tr -d '[:space:]' | cut -c1-)"
-OS_MAJOR_VERSION="$(echo $OS_FULL_VERSION | cut -d . -f 1)"
-OS_MINOR_VERSION="$(echo $OS_FULL_VERSION | cut -d . -f 2)"
-WINX=10
-WINY=60
-WINW=500
-WINH=350
-ICON_SIZE=128
-TEXT_SIZE=16
-FORMAT="UDZO"
-FILESYSTEM="HFS+"
-ADD_FILE_SOURCES=()
-ADD_FILE_TARGETS=()
-IMAGEKEY=""
-HDIUTIL_VERBOSITY=""
-SANDBOX_SAFE=0
-BLESS=0
-SKIP_JENKINS=0
-MAXIMUM_UNMOUNTING_ATTEMPTS=3
-SIGNATURE=""
-NOTARIZE=""
+set -ex;
 
 function pure_version() {
-	echo "$CDMG_VERSION"
-}
-
-function hdiutil_detach_retry() {
-	# Unmount
-	unmounting_attempts=0
-	until
-		echo "Unmounting disk image..."
-		(( unmounting_attempts++ ))
-		hdiutil detach "$1"
-		exit_code=$?
-		(( exit_code ==  0 )) && break            # nothing goes wrong
-		(( exit_code != 16 )) && exit $exit_code  # exit with the original exit code
-		# The above statement returns 1 if test failed (exit_code == 16).
-		#   It can make the code in the {do... done} block to be executed
-	do
-		(( unmounting_attempts == MAXIMUM_UNMOUNTING_ATTEMPTS )) && exit 16  # patience exhausted, exit with code EBUSY
-		echo "Wait a moment..."
-		sleep $(( 1 * (2 ** unmounting_attempts) ))
-	done
-	unset unmounting_attempts
+	echo '1.0.0.6'
 }
 
 function version() {
@@ -69,226 +19,180 @@ function version() {
 
 function usage() {
 	version
-	cat <<EOHELP
-
-Creates a fancy DMG file.
-
-Usage:  $(basename $0) [options] <output_name.dmg> <source_folder>
-
-All contents of <source_folder> will be copied into the disk image.
-
-Options:
-  --volname <name>
-      set volume name (displayed in the Finder sidebar and window title)
-  --volicon <icon.icns>
-      set volume icon
-  --background <pic.png>
-      set folder background image (provide png, gif, or jpg)
-  --window-pos <x> <y>
-      set position the folder window
-  --window-size <width> <height>
-      set size of the folder window
-  --text-size <text_size>
-      set window text size (10-16)
-  --icon-size <icon_size>
-      set window icons size (up to 128)
-  --icon file_name <x> <y>
-      set position of the file's icon
-  --hide-extension <file_name>
-      hide the extension of file
-  --app-drop-link <x> <y>
-      make a drop link to Applications, at location x,y
-  --ql-drop-link <x> <y>
-      make a drop link to user QuickLook install dir, at location x,y
-  --eula <eula_file>
-      attach a license file to the dmg (plain text or RTF)
-  --no-internet-enable
-      disable automatic mount & copy
-  --format <format>
-      specify the final disk image format (UDZO|UDBZ|ULFO|ULMO) (default is UDZO)
-  --filesystem <filesystem>
-      specify the disk image filesystem (HFS+|APFS) (default is HFS+, APFS supports macOS 10.13 or newer)
-  --encrypt
-      enable encryption for the resulting disk image (AES-256 - you will be prompted for password)
-  --encrypt-aes128
-      enable encryption for the resulting disk image (AES-128 - you will be prompted for password)
-  --add-file <target_name> <file>|<folder> <x> <y>
-      add additional file or folder (can be used multiple times)
-  --disk-image-size <x>
-      set the disk image size manually to x MB
-  --hdiutil-verbose
-      execute hdiutil in verbose mode
-  --hdiutil-quiet
-      execute hdiutil in quiet mode
-  --bless
-      bless the mount folder (deprecated, needs macOS 12.2.1 or older)
-  --codesign <signature>
-      codesign the disk image with the specified signature
-  --notarize <credentials>
-      notarize the disk image (waits and staples) with the keychain stored credentials
-  --sandbox-safe
-      execute hdiutil with sandbox compatibility and do not bless (not supported for APFS disk images)
-  --skip-jenkins
-      skip Finder-prettifying AppleScript, useful in Sandbox and non-GUI environments
-  --version
-	    show create-dmg version number
-  -h, --help
-	    display this help screen
-
-EOHELP
+	echo "Creates a fancy DMG file."
+	echo "Usage:  $(basename "$0") [options] <output_name.dmg> <source_folder>"
+	echo "All contents of <source_folder> will be copied into the disk image."
+	echo "Options:"
+	echo "  --volname name"
+	echo "      set volume name (displayed in the Finder sidebar and window title)"
+	echo "  --volicon icon.icns"
+	echo "      set volume icon"
+	echo "  --background pic.png"
+	echo "      set folder background image (provide png, gif, jpg)"
+	echo "  --window-pos x y"
+	echo "      set position the folder window"
+	echo "  --window-size width height"
+	echo "      set size of the folder window"
+	echo "  --text-size text_size"
+	echo "      set window text size (10-16)"
+	echo "  --icon-size icon_size"
+	echo "      set window icons size (up to 128)"
+	echo "  --icon file_name x y"
+	echo "      set position of the file's icon"
+	echo "  --hide-extension file_name"
+	echo "      hide the extension of file"
+	echo "  --app-drop-link x y"
+	echo "      make a drop link to Applications, at location x,y"
+	echo "  --ql-drop-link x y"
+	echo "      make a drop link to user QuickLook install dir, at location x,y"
+	echo "  --eula eula_file"
+	echo "      attach a license file to the dmg"
+	echo "  --no-internet-enable"
+	echo "      disable automatic mount&copy"
+	echo "  --format"
+	echo "      specify the final image format (default is UDZO)"
+	echo "  --add-file target_name file|folder x y"
+	echo "      add additional file or folder (can be used multiple times)"
+	echo "  --disk-image-size x"
+	echo "      set the disk image size manually to x MB"
+	echo "  --hdiutil-verbose"
+	echo "      execute hdiutil in verbose mode"
+	echo "  --hdiutil-quiet"
+	echo "      execute hdiutil in quiet mode"
+	echo "  --bless"
+  echo "      bless the mount folder (deprecated, needs macOS 12.2.1 or older)"
+	echo "  --sandbox-safe"
+	echo "      execute hdiutil with sandbox compatibility, do not bless and do not execute the cosmetic AppleScript"
+	echo "  --version         show tool version number"
+	echo "  -h, --help        display this help"
 	exit 0
 }
 
-# factors can cause interstitial disk images to contain more than a single
-# partition - expand the hunt for the temporary disk image by checking for
-# the path of the volume, versus assuming its the first result (as in pr/152).
-function find_mount_dir() {
-	local dev_name="${1}"
-
-	>&2 echo "Searching for mounted interstitial disk image using ${dev_name}... "
-	# enumerate up to 9 partitions
-	for i in {1..9}; do
-		# attempt to find the partition
-		local found_dir
-		found_dir=$(hdiutil info | grep -E --color=never "${dev_name}" | head -${i} | awk '{print $3}' | xargs)
-		if [[ -n "${found_dir}" ]]; then
-				echo "${found_dir}"
-				return 0
-		fi
-	done
-}
-
-# Argument parsing
+WINX=10
+WINY=60
+WINW=500
+WINH=350
+ICON_SIZE=128
+TEXT_SIZE=16
+FORMAT="UDZO"
+ADD_FILE_SOURCES=()
+ADD_FILE_TARGETS=()
+IMAGEKEY=""
+HDIUTIL_VERBOSITY=""
+SANDBOX_SAFE=0
+BLESS=0
+SKIP_JENKINS=0
+MAXIMUM_UNMOUNTING_ATTEMPTS=3
+POSITION_CLAUSE=""
+HIDING_CLAUSE=""
 
 while [[ "${1:0:1}" = "-" ]]; do
 	case $1 in
-		--volname)
-			VOLUME_NAME="$2"
-			shift; shift;;
-		--volicon)
-			VOLUME_ICON_FILE="$2"
-			shift; shift;;
-		--background)
-			BACKGROUND_FILE="$2"
-			BACKGROUND_FILE_NAME="$(basename "$BACKGROUND_FILE")"
-			BACKGROUND_CLAUSE="set background picture of opts to file \".background:$BACKGROUND_FILE_NAME\""
-			REPOSITION_HIDDEN_FILES_CLAUSE="set position of every item to {theBottomRightX + 100, 100}"
-			shift; shift;;
-		--icon-size)
-			ICON_SIZE="$2"
-			shift; shift;;
-		--text-size)
-			TEXT_SIZE="$2"
-			shift; shift;;
-		--window-pos)
-			WINX=$2; WINY=$3
-			shift; shift; shift;;
-		--window-size)
-			WINW=$2; WINH=$3
-			shift; shift; shift;;
-		--icon)
-			POSITION_CLAUSE="${POSITION_CLAUSE}set position of item \"$2\" to {$3, $4}
-			"
-			shift; shift; shift; shift;;
-		--hide-extension)
-			HIDING_CLAUSE="${HIDING_CLAUSE}set the extension hidden of item \"$2\" to true
-			"
-			shift; shift;;
-		-h | --help)
-			usage;;
-		--version)
-			version; exit 0;;
-		--pure-version)
-			pure_version; exit 0;;
-		--ql-drop-link)
-			QL_LINK=$2
-			QL_CLAUSE="set position of item \"QuickLook\" to {$2, $3}
-			"
-			shift; shift; shift;;
-		--app-drop-link)
-			APPLICATION_LINK=$2
-			APPLICATION_CLAUSE="set position of item \"Applications\" to {$2, $3}
-			"
-			shift; shift; shift;;
-		--eula)
-			EULA_RSRC=$2
-			shift; shift;;
-		--no-internet-enable)
-			NOINTERNET=1
-			shift;;
-		--format)
-			FORMAT="$2"
-			shift; shift;;
-		--filesystem)
-			FILESYSTEM="$2"
-			shift; shift;;
-		--encrypt)
-			ENABLE_ENCRYPTION=1
-			AESBITS=256
-			shift;;
-		--encrypt-aes128)
-			ENABLE_ENCRYPTION=1
-			AESBITS=128
-			shift;;
-		--add-file | --add-folder)
-			ADD_FILE_TARGETS+=("$2")
-			ADD_FILE_SOURCES+=("$3")
-			POSITION_CLAUSE="${POSITION_CLAUSE}
-			set position of item \"$2\" to {$4, $5}
-			"
-			shift; shift; shift; shift; shift;;
-		--disk-image-size)
-			DISK_IMAGE_SIZE="$2"
-			shift; shift;;
-		--hdiutil-verbose)
-			HDIUTIL_VERBOSITY='-verbose'
-			shift;;
-		--hdiutil-quiet)
-			HDIUTIL_VERBOSITY='-quiet'
-			shift;;
-		--codesign)
-			SIGNATURE="$2"
-			shift; shift;;
-		--notarize)
-			NOTARIZE="$2"
-			shift; shift;;
-		--sandbox-safe)
-			SANDBOX_SAFE=1
-			shift;;
-		--bless)
-			BLESS=1
-			shift;;
-		--rez)
-			echo "REZ is no more directly used. You can remove the --rez argument."
-			shift; shift;;
-		--skip-jenkins)
-			SKIP_JENKINS=1
-			shift;;
-		-*)
-			echo "Unknown option: $1. Run 'create-dmg --help' for help."
-			exit 1;;
+	--volname)
+		VOLUME_NAME="$2"
+		shift; shift;;
+	--volicon)
+		VOLUME_ICON_FILE="$2"
+		shift; shift;;
+	--background)
+		BACKGROUND_FILE="$2"
+		BACKGROUND_FILE_NAME="$(basename "$BACKGROUND_FILE")"
+		BACKGROUND_CLAUSE="set background picture of opts to file \".background:$BACKGROUND_FILE_NAME\""
+		REPOSITION_HIDDEN_FILES_CLAUSE="set position of every item to {theBottomRightX + 100, 100}"
+		shift; shift;;
+	--icon-size)
+		ICON_SIZE="$2"
+		shift; shift;;
+	--text-size)
+		TEXT_SIZE="$2"
+		shift; shift;;
+	--window-pos)
+		WINX=$2; WINY=$3
+		shift; shift; shift;;
+	--window-size)
+		WINW=$2; WINH=$3
+		shift; shift; shift;;
+	--icon)
+		POSITION_CLAUSE="${POSITION_CLAUSE}set position of item \"$2\" to {$3, $4}
+		"
+		shift; shift; shift; shift;;
+	--hide-extension)
+		HIDING_CLAUSE="${HIDING_CLAUSE}set the extension hidden of item \"$2\" to true
+		"
+		shift; shift;;
+	-h | --help)
+		usage;;
+	--version)
+		version; exit 0;;
+	--pure-version)
+		pure_version; exit 0;;
+	--ql-drop-link)
+		QL_LINK=$2
+		QL_CLAUSE="set position of item \"QuickLook\" to {$2, $3}
+		"
+		shift; shift; shift;;
+	--app-drop-link)
+		APPLICATION_LINK=$2
+		APPLICATION_CLAUSE="set position of item \"Applications\" to {$2, $3}
+		"
+		shift; shift; shift;;
+	--eula)
+		EULA_RSRC=$2
+		shift; shift;;
+	--no-internet-enable)
+		NOINTERNET=1
+		shift;;
+	--format)
+		FORMAT="$2"
+		shift; shift;;
+	--add-file | --add-folder)
+		ADD_FILE_TARGETS+=("$2")
+		ADD_FILE_SOURCES+=("$3")
+		POSITION_CLAUSE="${POSITION_CLAUSE}
+		set position of item \"$2\" to {$4, $5}
+		"
+		shift; shift; shift; shift; shift;;
+	--disk-image-size)
+		DISK_IMAGE_SIZE="$2"
+		shift; shift;;
+	--hdiutil-verbose)
+		HDIUTIL_VERBOSITY='-verbose'
+		shift;;
+	--hdiutil-quiet)
+		HDIUTIL_VERBOSITY='-quiet'
+		shift;;
+	--sandbox-safe)
+		SANDBOX_SAFE=1
+		shift;;
+	--bless)
+		BLESS=1
+		shift;;
+	--skip-jenkins)
+		SKIP_JENKINS=1
+		shift;;
+	-*)
+		echo "Unknown option: $1. Run with --help for help."
+		exit 1;;
 	esac
 	case $FORMAT in
-		UDZO)
-			IMAGEKEY="-imagekey zlib-level=9";;
-		UDBZ)
-			IMAGEKEY="-imagekey bzip2-level=9";;
-		ULFO)
-			;;
-		ULMO)
-			;;
-		*)
-			echo >&2 "Unknown disk image format: $FORMAT"
-			exit 1;;
+	UDZO)
+		IMAGEKEY="-imagekey zlib-level=9";;
+	UDBZ)
+		IMAGEKEY="-imagekey bzip2-level=9";;
 	esac
 done
 
 if [[ -z "$2" ]]; then
-	echo "Not enough arguments. Run 'create-dmg --help' for help."
+	echo "Not enough arguments. Invoke with --help for help."
 	exit 1
 fi
 
+SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DMG_PATH="$1"
+DMG_DIRNAME="$(dirname "$DMG_PATH")"
+DMG_DIR="$(cd "$DMG_DIRNAME" > /dev/null; pwd)"
+DMG_NAME="$(basename "$DMG_PATH")"
+DMG_TEMP_NAME="$DMG_DIR/rw.${DMG_NAME}"
 SRC_FOLDER="$(cd "$2" > /dev/null; pwd)"
 
 # Argument validation checks
@@ -298,48 +202,24 @@ if [[ "${DMG_PATH: -4}" != ".dmg" ]]; then
 	exit 1
 fi
 
-if [[ "${FILESYSTEM}" != "HFS+" ]] && [[ "${FILESYSTEM}" != "APFS" ]]; then
-	echo "Unknown disk image filesystem: ${FILESYSTEM}. Run 'create-dmg --help' for help."
-	exit 1
-fi
-
-if [[ "${FILESYSTEM}" == "APFS" ]] && [[ ${SANDBOX_SAFE} -eq 1 ]]; then
-	echo "Creating an APFS disk image that is sandbox safe is not supported."
-	exit 1
-fi
-
-# Main script logic
-
-SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-DMG_DIRNAME="$(dirname "$DMG_PATH")"
-DMG_DIR="$(cd "$DMG_DIRNAME" > /dev/null; pwd)"
-DMG_NAME="$(basename "$DMG_PATH")"
-DMG_TEMP_NAME="$DMG_DIR/rw.$$.${DMG_NAME}"
-
-# Detect where we're running from
-
-sentinel_file="$SCRIPT_DIR/.this-is-the-create-dmg-repo"
-if [[ -f "$sentinel_file" ]]; then
-	# We're running from inside a repo
-	CDMG_SUPPORT_DIR="$SCRIPT_DIR/support"
-else
-	# We're running inside an installed location
-	bin_dir="$SCRIPT_DIR"
-	prefix_dir=$(dirname "$bin_dir")
-	CDMG_SUPPORT_DIR="$prefix_dir/share/create-dmg/support"
-fi
-
 if [[ -z "$VOLUME_NAME" ]]; then
 	VOLUME_NAME="$(basename "$DMG_PATH" .dmg)"
 fi
 
-if [[ ! -d "$CDMG_SUPPORT_DIR" ]]; then
-	echo >&2 "Cannot find support/ directory: expected at: $CDMG_SUPPORT_DIR"
-	exit 1
+# brew formula will set this as 1 and embed the support scripts
+BREW_INSTALL=0
+
+AUX_PATH="$SCRIPT_DIR/support"
+
+if [ $BREW_INSTALL -eq 0 ]; then
+	test -d "$AUX_PATH" || {
+		echo "Cannot find support directory: $AUX_PATH"
+		exit 1
+	}
 fi
 
 if [[ -f "$SRC_FOLDER/.DS_Store" ]]; then
-	echo "Deleting .DS_Store found in source folder"
+	echo "Deleting any .DS_Store in source folder"
 	rm "$SRC_FOLDER/.DS_Store"
 fi
 
@@ -349,7 +229,7 @@ if [[ -f "${DMG_TEMP_NAME}" ]]; then
 	rm -f "${DMG_TEMP_NAME}"
 fi
 
-# Use Megabytes since hdiutil fails with very large byte numbers
+# Using Megabytes since hdiutil fails with very large Byte numbers
 function blocks_to_megabytes() {
 	# Add 1 extra MB, since there's no decimal retention here
 	MB_SIZE=$((($1 * 512 / 1000 / 1000) + 1))
@@ -358,13 +238,8 @@ function blocks_to_megabytes() {
 
 function get_size() {
 	# Get block size in disk
-	if [[ $OS_MAJOR_VERSION -ge 12 ]]; then
-		bytes_size=$(du -B 512 -s "$1")
-	else
-		bytes_size=$(du -s "$1")
-	fi
-	bytes_size=$(echo $bytes_size | sed -e 's/	.*//g')
-	echo $(blocks_to_megabytes $bytes_size)
+	bytes_size=$(du -s "$1" | sed -e 's/	.*//g')
+	echo $(blocks_to_megabytes "$bytes_size")
 }
 
 # Create the DMG with the specified size or the hdiutil estimation
@@ -373,14 +248,8 @@ if [[ -n "$DISK_IMAGE_SIZE" ]]; then
 	CUSTOM_SIZE="-size ${DISK_IMAGE_SIZE}m"
 fi
 
-if [[ $SANDBOX_SAFE -eq 0 ]]; then
-	if [[ "$FILESYSTEM" == "APFS" ]]; then
-		FILESYSTEM_ARGUMENTS=""
-	else
-		FILESYSTEM_ARGUMENTS="-c c=64,a=16,e=16"
-	fi
-	hdiutil create ${HDIUTIL_VERBOSITY} -srcfolder "$SRC_FOLDER" -volname "${VOLUME_NAME}" \
-		-fs "${FILESYSTEM}" -fsargs "${FILESYSTEM_ARGUMENTS}" -format UDRW ${CUSTOM_SIZE} "${DMG_TEMP_NAME}"
+if [ $SANDBOX_SAFE -eq 0 ]; then
+	hdiutil create ${HDIUTIL_VERBOSITY} -srcfolder "$SRC_FOLDER" -volname "${VOLUME_NAME}" -fs HFS+ -fsargs "-c c=64,a=16,e=16" -format UDRW ${CUSTOM_SIZE} "${DMG_TEMP_NAME}"
 else
 	hdiutil makehybrid ${HDIUTIL_VERBOSITY} -default-volume-name "${VOLUME_NAME}" -hfs -o "${DMG_TEMP_NAME}" "$SRC_FOLDER"
 	hdiutil convert -format UDRW -ov -o "${DMG_TEMP_NAME}" "${DMG_TEMP_NAME}"
@@ -391,7 +260,7 @@ fi
 DISK_IMAGE_SIZE=$(get_size "${DMG_TEMP_NAME}")
 
 # Use the custom size if bigger
-if [[ $SANDBOX_SAFE -eq 1 ]] && [[ ! -z "$DISK_IMAGE_SIZE_CUSTOM" ]] && [[ $DISK_IMAGE_SIZE_CUSTOM -gt $DISK_IMAGE_SIZE ]]; then
+if [[ $SANDBOX_SAFE -eq 1 ]] && [[ -n "$DISK_IMAGE_SIZE_CUSTOM" ]] && [[ $DISK_IMAGE_SIZE_CUSTOM -gt $DISK_IMAGE_SIZE ]]; then
 	DISK_IMAGE_SIZE=$DISK_IMAGE_SIZE_CUSTOM
 fi
 
@@ -409,39 +278,28 @@ DISK_IMAGE_SIZE=$(expr $DISK_IMAGE_SIZE + 20)
 # Make sure target image size is within limits
 MIN_DISK_IMAGE_SIZE=$(hdiutil resize -limits "${DMG_TEMP_NAME}" | awk 'NR=1{print int($1/2048+1)}')
 if [ $MIN_DISK_IMAGE_SIZE -gt $DISK_IMAGE_SIZE ]; then
-       DISK_IMAGE_SIZE=$MIN_DISK_IMAGE_SIZE
+  DISK_IMAGE_SIZE=$MIN_DISK_IMAGE_SIZE
 fi
 
 # Resize the image for the extra stuff
 hdiutil resize ${HDIUTIL_VERBOSITY} -size ${DISK_IMAGE_SIZE}m "${DMG_TEMP_NAME}"
 
-# Mount the new DMG
+# mount the new DMG
+echo "Mounting disk image..."
+MOUNT_DIR="/Volumes/${VOLUME_NAME}"
+
+# Unmount leftover dmg if it was mounted previously (e.g. developer mounted dmg, installed app and forgot to unmount it)
+if [[ -d "${MOUNT_DIR}" ]]; then
+  echo "Unmounting previously mounted disk image..."
+	DEV_NAME=$(hdiutil info | grep -E --color=never '^/dev/' | sed 1q | awk '{print $1}')
+  hdiutil detach "${DEV_NAME}"
+fi
 
 echo "Mounting disk image..."
 
-MOUNT_RANDOM_PATH="/Volumes"
-if [[ $SANDBOX_SAFE -eq 1 ]]; then
-	MOUNT_RANDOM_PATH="/tmp"
-fi
-if [[ "$FILESYSTEM" == "APFS" ]]; then
-  HDIUTIL_FILTER="tail -n 1"
-else
-  HDIUTIL_FILTER="sed 1q"
-fi
-DEV_NAME=$(hdiutil attach -mountrandom ${MOUNT_RANDOM_PATH} -readwrite -noverify -noautoopen -nobrowse "${DMG_TEMP_NAME}" | grep -E --color=never '^/dev/' | ${HDIUTIL_FILTER} | awk '{print $1}')
+echo "Mount directory: $MOUNT_DIR"
+DEV_NAME=$(hdiutil attach -readwrite -noverify -noautoopen "${DMG_TEMP_NAME}" | grep -E --color=never '^/dev/' | sed 1q | awk '{print $1}')
 echo "Device name:     $DEV_NAME"
-if [[ "$FILESYSTEM" == "APFS" ]]; then
-  MOUNT_DIR=$(find_mount_dir "${DEV_NAME}")
-else
-	MOUNT_DIR=$(find_mount_dir "${DEV_NAME}s")
-fi
-if [[ -z "${MOUNT_DIR}" ]]; then
-  >&2 echo "ERROR: unable to proceed with final disk image creation because the interstitial disk image was not found."
-  >&2 echo "The interstitial disk image will likely be mounted and will need to be cleaned up manually."
-  exit 1
-fi
-
-echo "Mount dir:       $MOUNT_DIR"
 
 if [[ -n "$BACKGROUND_FILE" ]]; then
 	echo "Copying background file '$BACKGROUND_FILE'..."
@@ -450,14 +308,12 @@ if [[ -n "$BACKGROUND_FILE" ]]; then
 fi
 
 if [[ -n "$APPLICATION_LINK" ]]; then
-	echo "Making link to Applications dir..."
-	echo $MOUNT_DIR
-	ln -s /Applications "$MOUNT_DIR/Applications"
+	echo "making link to Applications dir"
+	test -d "$MOUNT_DIR/Applications" || ln -s /Applications "$MOUNT_DIR/Applications"
 fi
 
 if [[ -n "$QL_LINK" ]]; then
-	echo "Making link to QuickLook install dir..."
-	echo $MOUNT_DIR
+	echo "making link to QuickLook install dir"
 	ln -s "/Library/QuickLook" "$MOUNT_DIR/QuickLook"
 fi
 
@@ -475,15 +331,24 @@ if [[ -n "$ADD_FILE_SOURCES" ]]; then
 	done
 fi
 
-VOLUME_NAME=$(basename $MOUNT_DIR)
-
-# Run AppleScript to do all the Finder cosmetic stuff
+# run AppleScript to do all the Finder cosmetic stuff
 APPLESCRIPT_FILE=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
+
+function applescript_source() {
+	if [ $BREW_INSTALL -eq 0 ]; then
+		cat "$AUX_PATH/template.applescript"
+	else
+		cat << 'EOS'
+		# BREW_INLINE_APPLESCRIPT_PLACEHOLDER
+EOS
+	fi
+}
+
 if [[ $SANDBOX_SAFE -eq 1 ]]; then
 	echo "Skipping Finder-prettifying AppleScript because we are in Sandbox..."
 else
 	if [[ $SKIP_JENKINS -eq 0 ]]; then
-		cat "$CDMG_SUPPORT_DIR/template.applescript" \
+		applescript_source \
 			| sed -e "s/WINX/$WINX/g" -e "s/WINY/$WINY/g" -e "s/WINW/$WINW/g" \
 					-e "s/WINH/$WINH/g" -e "s/BACKGROUND_CLAUSE/$BACKGROUND_CLAUSE/g" \
 					-e "s/REPOSITION_HIDDEN_FILES_CLAUSE/$REPOSITION_HIDDEN_FILES_CLAUSE/g" \
@@ -493,76 +358,71 @@ else
 			| perl -pe "s/APPLICATION_CLAUSE/$APPLICATION_CLAUSE/g" \
 			| perl -pe "s/HIDING_CLAUSE/$HIDING_CLAUSE/" \
 			> "$APPLESCRIPT_FILE"
-
-		# pause to workaround occasional "Can’t get disk" (-1728) issues
-		ERROR_1728_WORKAROUND_SLEEP_INTERVAL=2
-		echo "Will sleep for $ERROR_1728_WORKAROUND_SLEEP_INTERVAL seconds to workaround occasions \"Can't get disk (-1728)\" issues..."
-		sleep $ERROR_1728_WORKAROUND_SLEEP_INTERVAL
-
+		sleep 2 # pause to workaround occasional "Can't get disk" (-1728) issues
 		echo "Running AppleScript to make Finder stuff pretty: /usr/bin/osascript \"${APPLESCRIPT_FILE}\" \"${VOLUME_NAME}\""
 		if /usr/bin/osascript "${APPLESCRIPT_FILE}" "${VOLUME_NAME}"; then
 			# Okay, we're cool
 			true
 		else
 			echo >&2 "Failed running AppleScript"
-			hdiutil_detach_retry "${DEV_NAME}"
+			hdiutil detach "${DEV_NAME}"
 			exit 64
 		fi
 		echo "Done running the AppleScript..."
 		sleep 4
 		rm "$APPLESCRIPT_FILE"
-	else
-		echo ''
-		echo "Will skip running AppleScript to configure DMG aesthetics because of --skip-jenkins option."
-		echo "This will result in a DMG without any custom background or icons positioning."
-		echo "More info at https://github.com/create-dmg/create-dmg/issues/72"
-		echo ''
 	fi
 fi
 
-# Make sure it's not world writeable
+# make sure it's not world writeable
 echo "Fixing permissions..."
 chmod -Rf go-w "${MOUNT_DIR}" &> /dev/null || true
-echo "Done fixing permissions"
+echo "Done fixing permissions."
 
-# Make the top window open itself on mount:
+# make the top window open itself on mount:
 if [[ $BLESS -eq 1 && $SANDBOX_SAFE -eq 0 ]]; then
 	echo "Blessing started"
-	if [ $(uname -m) == "arm64" ]; then
-		bless --folder "${MOUNT_DIR}"
-	else
-		bless --folder "${MOUNT_DIR}" --openfolder "${MOUNT_DIR}"
-	fi
+	bless --folder "${MOUNT_DIR}" --openfolder "${MOUNT_DIR}"
 	echo "Blessing finished"
 else
 	echo "Skipping blessing on sandbox"
 fi
 
 if [[ -n "$VOLUME_ICON_FILE" ]]; then
-	# Tell the volume that it has a special file attribute
+	# tell the volume that it has a special file attribute
 	SetFile -a C "$MOUNT_DIR"
 fi
 
-# Delete unnecessary file system events log if possible
+# Delete unnecessary file system events log
 echo "Deleting .fseventsd"
-rm -rf "${MOUNT_DIR}/.fseventsd" || true
+rm -rf "${MOUNT_DIR}/.fseventsd"
 
-hdiutil_detach_retry "${DEV_NAME}"
+# unmount
+unmounting_attempts=0
+until
+  echo "Unmounting disk image..."
+  (( unmounting_attempts++ ))
+  hdiutil detach "${DEV_NAME}"
+	exit_code=$?
+	(( exit_code ==  0 )) && break            # nothing goes wrong
+	(( exit_code != 16 )) && exit $exit_code  # exit with the original exit code
+	# The above statement returns 1 if test failed (exit_code == 16).
+	#   It can make the code in the {do... done} block to be executed
+do
+  (( unmounting_attempts == MAXIMUM_UNMOUNTING_ATTEMPTS )) && exit 16  # patience exhausted, exit with code EBUSY
+	echo "Wait a moment..."
+  sleep $(( 1 * (2 ** unmounting_attempts) ))
+done
+unset unmounting_attempts
 
-# Compress image and optionally encrypt
-if [[ $ENABLE_ENCRYPTION -eq 0 ]]; then
-	echo "Compressing disk image..."
-	hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format ${FORMAT} ${IMAGEKEY} -o "${DMG_DIR}/${DMG_NAME}"
-else
-	echo "Compressing and encrypting disk image..."
-	echo "NOTE: hdiutil will only prompt a single time for a password - ensure entry is correct."
-	hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format ${FORMAT} ${IMAGEKEY} -encryption AES-${AESBITS} -stdinpass -o "${DMG_DIR}/${DMG_NAME}"
-fi
+# compress image
+echo "Compressing disk image..."
+hdiutil convert ${HDIUTIL_VERBOSITY} "${DMG_TEMP_NAME}" -format "${FORMAT}" ${IMAGEKEY} -o "${DMG_DIR}/${DMG_NAME}"
 rm -f "${DMG_TEMP_NAME}"
 
-# Adding EULA resources
+# adding EULA resources
 if [[ -n "${EULA_RSRC}" && "${EULA_RSRC}" != "-null-" ]]; then
-	echo "Adding EULA resources..."
+	echo "adding EULA resources"
 	#
 	# Use udifrez instead flatten/rez/unflatten
 	# https://github.com/create-dmg/create-dmg/issues/109
@@ -571,19 +431,20 @@ if [[ -n "${EULA_RSRC}" && "${EULA_RSRC}" != "-null-" ]]; then
 	# https://developer.apple.com/forums/thread/668084
 	#
 	EULA_RESOURCES_FILE=$(mktemp -t createdmg.tmp.XXXXXXXXXX)
-	EULA_FORMAT=$(file -b ${EULA_RSRC})
+	EULA_FORMAT=$(file -b "${EULA_RSRC}")
 	if [[ ${EULA_FORMAT} == 'Rich Text Format data'* ]] ; then
 		EULA_FORMAT='RTF '
 	else
 		EULA_FORMAT='TEXT'
 	fi
+
 	# Encode the EULA to base64
 	# Replace 'openssl base64' with 'base64' if Mac OS X 10.6 support is no more needed
 	# EULA_DATA="$(base64 -b 52 "${EULA_RSRC}" | sed s$'/^\(.*\)$/\t\t\t\\1/')"
 	EULA_DATA="$(openssl base64 -in "${EULA_RSRC}" | tr -d '\n' | awk '{gsub(/.{52}/,"&\n")}1' | sed s$'/^\(.*\)$/\t\t\t\\1/')"
 	# Fill the template with the custom EULA contents
 	eval "cat > \"${EULA_RESOURCES_FILE}\" <<EOF
-	$(<${CDMG_SUPPORT_DIR}/eula-resources-template.xml)
+	$(<${AUX_PATH}/eula-resources-template.xml)
 	EOF
 	"
 	# Apply the resources
@@ -594,45 +455,19 @@ if [[ -n "${EULA_RSRC}" && "${EULA_RSRC}" != "-null-" ]]; then
 	echo "Successfully added the EULA license"
 fi
 
-# Enable "internet", whatever that is
-if [[ ! -z "${NOINTERNET}" && "${NOINTERNET}" == 1 ]]; then
-	echo "Not setting 'internet-enable' on the dmg, per caller request"
+if [[ -n "${NOINTERNET}" && "${NOINTERNET}" == 1 ]]; then
+	echo "not setting 'internet-enable' on the dmg"
 else
-	# Check if hdiutil supports internet-enable
-	# Support was removed in macOS 10.15. See https://github.com/andreyvit/create-dmg/issues/76
-	if hdiutil internet-enable -help >/dev/null 2>/dev/null; then
+	# check if hdiutil supports internet-enable
+	# support was removed in macOS 10.15
+	# https://github.com/andreyvit/create-dmg/issues/76
+	if hdiutil internet-enable -help >/dev/null 2>/dev/null
+	then
 		hdiutil internet-enable -yes "${DMG_DIR}/${DMG_NAME}"
 	else
 		echo "hdiutil does not support internet-enable. Note it was removed in macOS 10.15."
 	fi
 fi
 
-if [[ -n "${SIGNATURE}" && "${SIGNATURE}" != "-null-" ]]; then
-	echo "Codesign started"
-	codesign -s "${SIGNATURE}" "${DMG_DIR}/${DMG_NAME}"
-	dmgsignaturecheck="$(codesign --verify --deep --verbose=2 --strict "${DMG_DIR}/${DMG_NAME}" 2>&1 >/dev/null)"
-	if [ $? -eq 0 ]; then
-		echo "The disk image is now codesigned"
-	else
-		echo "The signature seems invalid${NC}"
-		exit 1
-	fi
-fi
-
-if [[ -n "${NOTARIZE}" && "${NOTARIZE}" != "-null-" ]]; then
-	echo "Notarization started"
-	xcrun notarytool submit "${DMG_DIR}/${DMG_NAME}" --keychain-profile "${NOTARIZE}" --wait
-	echo "Stapling the notarization ticket"
-	staple="$(xcrun stapler staple "${DMG_DIR}/${DMG_NAME}")"
-	if [ $? -eq 0 ]; then
-		echo "The disk image is now notarized"
-	else
-		echo "$staple"
-		echo "The notarization failed with error $?"
-		exit 1
-	fi
-fi
-
-# All done!
 echo "Disk image done"
 exit 0

crates/tauri-bundler/src/bundle/macos/dmg/mod.rs

@@ -5,12 +5,12 @@
 
 use super::{app, icon::create_icns_file};
 use crate::{
-  bundle::{settings::Arch, Bundle},
-  error::{Context, ErrorExt},
-  utils::CommandExt,
+  bundle::{common::CommandExt, settings::Arch, Bundle},
   PackageType, Settings,
 };
 
+use anyhow::Context;
+
 use std::{
   env,
   fs::{self, write},
@@ -48,7 +48,8 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
       Arch::Universal => "universal",
       target => {
         return Err(crate::Error::ArchError(format!(
-          "Unsupported architecture: {target:?}"
+          "Unsupported architecture: {:?}",
+          target
         )));
       }
     }
@@ -57,20 +58,20 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
   let dmg_path = output_path.join(&dmg_name);
 
   let product_name = settings.product_name();
-  let bundle_file_name = format!("{product_name}.app");
+  let bundle_file_name = format!("{}.app", product_name);
   let bundle_dir = settings.project_out_directory().join("bundle/macos");
 
-  let support_directory_path = output_path
-    .parent()
-    .unwrap()
-    .join("share/create-dmg/support");
-
-  for path in &[&support_directory_path, &output_path] {
-    if path.exists() {
-      fs::remove_dir_all(path).fs_context("failed to remove old dmg", path.to_path_buf())?;
-    }
-    fs::create_dir_all(path).fs_context("failed to create output directory", path.to_path_buf())?;
+  let support_directory_path = output_path.join("support");
+  if output_path.exists() {
+    fs::remove_dir_all(&output_path)
+      .with_context(|| format!("Failed to remove old {}", dmg_name))?;
   }
+  fs::create_dir_all(&support_directory_path).with_context(|| {
+    format!(
+      "Failed to create output directory at {:?}",
+      support_directory_path
+    )
+  })?;
 
   // create paths for script
   let bundle_script_path = output_path.join("bundle_dmg.sh");
@@ -171,11 +172,9 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
 
   // Issue #592 - Building MacOS dmg files on CI
   // https://github.com/tauri-apps/tauri/issues/592
-  if env::var_os("TAURI_BUNDLER_DMG_IGNORE_CI").unwrap_or_default() != "true" {
-    if let Some(value) = env::var_os("CI") {
-      if value == "true" {
-        bundle_dmg_cmd.arg("--skip-jenkins");
-      }
+  if let Some(value) = env::var_os("CI") {
+    if value == "true" {
+      bundle_dmg_cmd.arg("--skip-jenkins");
     }
   }
 
@@ -191,19 +190,16 @@ pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<
   fs::rename(bundle_dir.join(dmg_name), dmg_path.clone())?;
 
   // Sign DMG if needed
-  // skipping self-signing DMGs https://github.com/tauri-apps/tauri/issues/12288
-  let identity = settings.macos().signing_identity.as_deref();
-  if !settings.no_sign() && identity != Some("-") {
-    if let Some(keychain) = super::sign::keychain(identity)? {
-      super::sign::sign(
-        &keychain,
-        vec![super::sign::SignTarget {
-          path: dmg_path.clone(),
-          is_an_executable: false,
-        }],
-        settings,
-      )?;
-    }
+
+  if let Some(keychain) = super::sign::keychain(settings.macos().signing_identity.as_deref())? {
+    super::sign::sign(
+      &keychain,
+      vec![super::sign::SignTarget {
+        path: dmg_path.clone(),
+        is_an_executable: false,
+      }],
+      settings,
+    )?;
   }
 
   Ok(Bundled {

crates/tauri-bundler/src/bundle/macos/icon.rs

@@ -3,8 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::bundle::Settings;
-use crate::utils::{self, fs_utils};
+use crate::bundle::{common, Settings};
 use std::{
   cmp::min,
   ffi::OsStr,
@@ -29,7 +28,7 @@ pub fn create_icns_file(out_dir: &Path, settings: &Settings) -> crate::Result<Op
     if icon_path.extension() == Some(OsStr::new("icns")) {
       let mut dest_path = out_dir.to_path_buf();
       dest_path.push(icon_path.file_name().expect("Could not get icon filename"));
-      fs_utils::copy_file(&icon_path, &dest_path)?;
+      common::copy_file(&icon_path, &dest_path)?;
       return Ok(Some(dest_path));
     }
   }
@@ -64,7 +63,7 @@ pub fn create_icns_file(out_dir: &Path, settings: &Settings) -> crate::Result<Op
   for icon_path in settings.icon_files() {
     let icon_path = icon_path?;
     let icon = image::open(&icon_path)?;
-    let density = if utils::is_retina(&icon_path) { 2 } else { 1 };
+    let density = if common::is_retina(&icon_path) { 2 } else { 1 };
     let (w, h) = icon.dimensions();
     let orig_size = min(w, h);
     let next_size_down = 2f32.powf((orig_size as f32).log2().floor()) as u32;

crates/tauri-bundler/src/bundle/macos/ios.rs

@@ -13,12 +13,9 @@
 // See https://developer.apple.com/go/?id=bundle-structure for a full
 // explanation.
 
-use crate::{
-  error::{Context, ErrorExt},
-  utils::{self, fs_utils},
-  Settings,
-};
+use crate::{bundle::common, Settings};
 
+use anyhow::Context;
 use image::{codecs::png::PngDecoder, GenericImageView, ImageDecoder};
 
 use std::{
@@ -45,16 +42,16 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   if app_bundle_path.exists() {
     fs::remove_dir_all(&app_bundle_path)
-      .fs_context("failed to remove old app bundle", &app_bundle_path)?;
+      .with_context(|| format!("Failed to remove old {}", app_product_name))?;
   }
   fs::create_dir_all(&app_bundle_path)
-    .fs_context("failed to create bundle directory", &app_bundle_path)?;
+    .with_context(|| format!("Failed to create bundle directory at {:?}", app_bundle_path))?;
 
   for src in settings.resource_files() {
     let src = src?;
     let dest = app_bundle_path.join(tauri_utils::resources::resource_relpath(&src));
-    fs_utils::copy_file(&src, &dest)
-      .with_context(|| format!("Failed to copy resource file {src:?}"))?;
+    common::copy_file(&src, &dest)
+      .with_context(|| format!("Failed to copy resource file {:?}", src))?;
   }
 
   let icon_filenames = generate_icon_files(&app_bundle_path, settings)
@@ -64,8 +61,8 @@ pub fn bundle_project(settings: &Settings) -> crate::Result<Vec<PathBuf>> {
 
   for bin in settings.binaries() {
     let bin_path = settings.binary_path(bin);
-    fs_utils::copy_file(&bin_path, &app_bundle_path.join(bin.name()))
-      .with_context(|| format!("Failed to copy binary from {bin_path:?}"))?;
+    common::copy_file(&bin_path, app_bundle_path.join(bin.name()))
+      .with_context(|| format!("Failed to copy binary from {:?}", bin_path))?;
   }
 
   Ok(vec![app_bundle_path])
@@ -96,11 +93,11 @@ fn generate_icon_files(bundle_dir: &Path, settings: &Settings) -> crate::Result<
       let decoder = PngDecoder::new(BufReader::new(File::open(&icon_path)?))?;
       let width = decoder.dimensions().0;
       let height = decoder.dimensions().1;
-      let is_retina = utils::is_retina(&icon_path);
+      let is_retina = common::is_retina(&icon_path);
       if !sizes.contains(&(width, height, is_retina)) {
         sizes.insert((width, height, is_retina));
         let dest_path = get_dest_path(width, height, is_retina);
-        fs_utils::copy_file(&icon_path, &dest_path)?;
+        common::copy_file(&icon_path, &dest_path)?;
       }
     }
     // Fall back to non-PNG files for any missing sizes.
@@ -124,12 +121,12 @@ fn generate_icon_files(bundle_dir: &Path, settings: &Settings) -> crate::Result<
       } else {
         let icon = image::open(&icon_path)?;
         let (width, height) = icon.dimensions();
-        let is_retina = utils::is_retina(&icon_path);
+        let is_retina = common::is_retina(&icon_path);
         if !sizes.contains(&(width, height, is_retina)) {
           sizes.insert((width, height, is_retina));
           let dest_path = get_dest_path(width, height, is_retina);
           icon.write_to(
-            &mut fs_utils::create_file(&dest_path)?,
+            &mut common::create_file(&dest_path)?,
             image::ImageFormat::Png,
           )?;
         }
@@ -145,7 +142,7 @@ fn generate_info_plist(
   settings: &Settings,
   icon_filenames: &[String],
 ) -> crate::Result<()> {
-  let file = &mut fs_utils::create_file(&bundle_dir.join("Info.plist"))?;
+  let file = &mut common::create_file(&bundle_dir.join("Info.plist"))?;
   writeln!(
     file,
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n\
@@ -178,11 +175,7 @@ fn generate_info_plist(
   writeln!(
     file,
     "  <key>CFBundleVersion</key>\n  <string>{}</string>",
-    settings
-      .ios()
-      .bundle_version
-      .as_deref()
-      .unwrap_or_else(|| settings.version_string())
+    settings.version_string()
   )?;
   writeln!(
     file,
@@ -197,7 +190,7 @@ fn generate_info_plist(
   if !icon_filenames.is_empty() {
     writeln!(file, "  <key>CFBundleIconFiles</key>\n  <array>")?;
     for filename in icon_filenames {
-      writeln!(file, "    <string>{filename}</string>")?;
+      writeln!(file, "    <string>{}</string>", filename)?;
     }
     writeln!(file, "  </array>")?;
   }

crates/tauri-bundler/src/bundle/macos/sign.rs

@@ -6,10 +6,10 @@
 use std::{
   env::{var, var_os},
   ffi::OsString,
-  path::PathBuf,
+  path::{Path, PathBuf},
 };
 
-use crate::{error::NotarizeAuthError, Entitlements, Settings};
+use crate::Settings;
 
 pub struct SignTarget {
   pub path: PathBuf,
@@ -21,16 +21,13 @@ pub fn keychain(identity: Option<&str>) -> crate::Result<Option<tauri_macos_sign
     var_os("APPLE_CERTIFICATE"),
     var_os("APPLE_CERTIFICATE_PASSWORD"),
   ) {
-    // import user certificate - useful for CI build
+    // import user certificate - useful for for CI build
     let keychain =
-      tauri_macos_sign::Keychain::with_certificate(&certificate_encoded, &certificate_password)
-        .map_err(Box::new)?;
+      tauri_macos_sign::Keychain::with_certificate(&certificate_encoded, &certificate_password)?;
     if let Some(identity) = identity {
       let certificate_identity = keychain.signing_identity();
       if !certificate_identity.contains(identity) {
-        return Err(crate::Error::GenericError(format!(
-          "certificate from APPLE_CERTIFICATE \"{certificate_identity}\" environment variable does not match provided identity \"{identity}\""
-        )));
+        return Err(anyhow::anyhow!("certificate from APPLE_CERTIFICATE \"{certificate_identity}\" environment variable does not match provided identity \"{identity}\"").into());
       }
     }
     Ok(Some(keychain))
@@ -51,23 +48,11 @@ pub fn sign(
   log::info!(action = "Signing"; "with identity \"{}\"", keychain.signing_identity());
 
   for target in targets {
-    let (entitlements_path, _temp_file) = match settings.macos().entitlements.as_ref() {
-      Some(Entitlements::Path(path)) => (Some(path.to_owned()), None),
-      Some(Entitlements::Plist(plist)) => {
-        let mut temp_file = tempfile::NamedTempFile::new()?;
-        plist::to_writer_xml(temp_file.as_file_mut(), &plist)?;
-        (Some(temp_file.path().to_path_buf()), Some(temp_file))
-      }
-      None => (None, None),
-    };
-
-    keychain
-      .sign(
-        &target.path,
-        entitlements_path.as_deref(),
-        target.is_an_executable && settings.macos().hardened_runtime,
-      )
-      .map_err(Box::new)?;
+    keychain.sign(
+      &target.path,
+      settings.macos().entitlements.as_ref().map(Path::new),
+      target.is_an_executable && settings.macos().hardened_runtime,
+    )?;
   }
 
   Ok(())
@@ -78,19 +63,17 @@ pub fn notarize(
   app_bundle_path: PathBuf,
   credentials: &tauri_macos_sign::AppleNotarizationCredentials,
 ) -> crate::Result<()> {
-  tauri_macos_sign::notarize(keychain, &app_bundle_path, credentials)
-    .map_err(Box::new)
-    .map_err(Into::into)
+  tauri_macos_sign::notarize(keychain, &app_bundle_path, credentials).map_err(Into::into)
 }
 
-pub fn notarize_without_stapling(
-  keychain: &tauri_macos_sign::Keychain,
-  app_bundle_path: PathBuf,
-  credentials: &tauri_macos_sign::AppleNotarizationCredentials,
-) -> crate::Result<()> {
-  tauri_macos_sign::notarize_without_stapling(keychain, &app_bundle_path, credentials)
-    .map_err(Box::new)
-    .map_err(Into::into)
+#[derive(Debug, thiserror::Error)]
+pub enum NotarizeAuthError {
+  #[error(
+    "The team ID is now required for notarization with app-specific password as authentication. Please set the `APPLE_TEAM_ID` environment variable. You can find the team ID in https://developer.apple.com/account#MembershipDetailsCard."
+  )]
+  MissingTeamId,
+  #[error(transparent)]
+  Anyhow(#[from] anyhow::Error),
 }
 
 pub fn notarize_auth() -> Result<tauri_macos_sign::AppleNotarizationCredentials, NotarizeAuthError>
@@ -109,18 +92,10 @@ pub fn notarize_auth() -> Result<tauri_macos_sign::AppleNotarizationCredentials,
     }
     (Some(_apple_id), Some(_password), None) => Err(NotarizeAuthError::MissingTeamId),
     _ => {
-      match (
-        var_os("APPLE_API_KEY"),
-        var_os("APPLE_API_ISSUER"),
-        var("APPLE_API_KEY_PATH"),
-      ) {
+      match (var_os("APPLE_API_KEY"), var_os("APPLE_API_ISSUER"), var("APPLE_API_KEY_PATH")) {
         (Some(key_id), Some(issuer), Ok(key_path)) => {
-          Ok(tauri_macos_sign::AppleNotarizationCredentials::ApiKey {
-            key_id,
-            key: tauri_macos_sign::ApiKey::Path(key_path.into()),
-            issuer,
-          })
-        }
+          Ok(tauri_macos_sign::AppleNotarizationCredentials::ApiKey { key_id, key: tauri_macos_sign::ApiKey::Path( key_path.into()), issuer })
+        },
         (Some(key_id), Some(issuer), Err(_)) => {
           let mut api_key_file_name = OsString::from("AuthKey_");
           api_key_file_name.push(&key_id);
@@ -142,18 +117,12 @@ pub fn notarize_auth() -> Result<tauri_macos_sign::AppleNotarizationCredentials,
           }
 
           if let Some(key_path) = key_path {
-            Ok(tauri_macos_sign::AppleNotarizationCredentials::ApiKey {
-              key_id,
-              key: tauri_macos_sign::ApiKey::Path(key_path),
-              issuer,
-            })
+          Ok(tauri_macos_sign::AppleNotarizationCredentials::ApiKey { key_id, key: tauri_macos_sign::ApiKey::Path(key_path), issuer })
           } else {
-            Err(NotarizeAuthError::MissingApiKey {
-              file_name: api_key_file_name.to_string_lossy().into_owned(),
-            })
+            Err(anyhow::anyhow!("could not find API key file. Please set the APPLE_API_KEY_PATH environment variables to the path to the {api_key_file_name:?} file").into())
           }
         }
-        _ => Err(NotarizeAuthError::MissingCredentials),
+        _ => Err(anyhow::anyhow!("no APPLE_ID & APPLE_PASSWORD & APPLE_TEAM_ID or APPLE_API_KEY & APPLE_API_ISSUER & APPLE_API_KEY_PATH environment variables found").into())
       }
     }
   }

crates/tauri-bundler/src/bundle/path_utils.rs

@@ -0,0 +1,287 @@
+// Copyright 2016-2019 Cargo-Bundle developers <https://github.com/burtonageo/cargo-bundle>
+// Copyright 2019-2024 Tauri Programme within The Commons Conservancy
+// SPDX-License-Identifier: Apache-2.0
+// SPDX-License-Identifier: MIT
+
+use std::{
+  fs::{create_dir, create_dir_all, read_dir, remove_dir_all},
+  path::{Path, PathBuf},
+};
+
+/// Directory options.
+#[derive(Default, Clone)]
+pub struct DirOpts {
+  pub depth: u64,
+}
+
+/// File options.
+pub struct FileOpts {
+  pub overwrite: bool,
+  pub skip: bool,
+  #[allow(dead_code)]
+  pub buffer_size: usize,
+}
+
+/// Copy options.
+#[derive(Clone)]
+pub struct Options {
+  pub overwrite: bool,
+  pub skip: bool,
+  pub buffer_size: usize,
+  pub copy_files: bool,
+  pub content_only: bool,
+  pub depth: u64,
+}
+
+/// Directory information descriptor
+pub struct DirInfo {
+  pub size: u64,
+  pub files: Vec<String>,
+  pub directories: Vec<String>,
+}
+
+impl Default for Options {
+  fn default() -> Options {
+    Options {
+      overwrite: false,
+      skip: false,
+      buffer_size: 64000,
+      copy_files: false,
+      content_only: false,
+      depth: 0,
+    }
+  }
+}
+
+impl Default for FileOpts {
+  fn default() -> FileOpts {
+    FileOpts {
+      overwrite: false,
+      skip: false,
+      buffer_size: 64000,
+    }
+  }
+}
+
+/// Creates the given directory path,
+/// erasing it first if specified.
+pub fn create<P>(path: P, erase: bool) -> crate::Result<()>
+where
+  P: AsRef<Path>,
+{
+  if erase && path.as_ref().exists() {
+    remove(&path)?;
+  }
+  Ok(create_dir(&path)?)
+}
+
+/// Creates all of the directories of the specified path,
+/// erasing it first if specified.
+pub fn create_all<P>(path: P, erase: bool) -> crate::Result<()>
+where
+  P: AsRef<Path>,
+{
+  if erase && path.as_ref().exists() {
+    remove(&path)?;
+  }
+  Ok(create_dir_all(&path)?)
+}
+
+/// Removes the directory if it exists.
+pub fn remove<P: AsRef<Path>>(path: P) -> crate::Result<()> {
+  if path.as_ref().exists() {
+    Ok(remove_dir_all(path)?)
+  } else {
+    Ok(())
+  }
+}
+
+/// Copy file with the given options.
+pub fn copy_file<P, Q>(from: P, to: Q, options: &FileOpts) -> crate::Result<u64>
+where
+  P: AsRef<Path>,
+  Q: AsRef<Path>,
+{
+  let from = from.as_ref();
+  if !from.exists() {
+    if let Some(msg) = from.to_str() {
+      let msg = format!("Path \"{msg}\" does not exist or you don't have access");
+      return Err(crate::Error::PathUtilError(msg));
+    }
+    return Err(crate::Error::PathUtilError(
+      "Path does not exist or you don't have access!".to_owned(),
+    ));
+  }
+
+  if !from.is_file() {
+    if let Some(msg) = from.to_str() {
+      let msg = format!("Path \"{msg}\" is not a file!");
+      return Err(crate::Error::PathUtilError(msg));
+    }
+    return Err(crate::Error::PathUtilError(
+      "Path is not a file!".to_owned(),
+    ));
+  }
+  if !options.overwrite && to.as_ref().exists() {
+    if options.skip {
+      return Ok(0);
+    }
+
+    if let Some(msg) = to.as_ref().to_str() {
+      let msg = format!("Path \"{msg}\" is exist");
+      return Err(crate::Error::PathUtilError(msg));
+    }
+  }
+
+  Ok(std::fs::copy(from, to)?)
+}
+
+/// Copies the directory with the given options.
+#[allow(dead_code)]
+pub fn copy<P, Q>(from: P, to: Q, options: &Options) -> crate::Result<u64>
+where
+  P: AsRef<Path>,
+  Q: AsRef<Path>,
+{
+  let from = from.as_ref();
+  if !from.exists() {
+    if let Some(msg) = from.to_str() {
+      let msg = format!("Path \"{msg}\" does not exist or you don't have access!");
+      return Err(crate::Error::PathUtilError(msg));
+    }
+    return Err(crate::Error::PathUtilError(
+      "Path does not exist or you don't have access".to_owned(),
+    ));
+  }
+  if !from.is_dir() {
+    if let Some(msg) = from.to_str() {
+      let msg = format!("Path \"{msg}\" is not a directory!");
+      return Err(crate::Error::PathUtilError(msg));
+    }
+    return Err(crate::Error::PathUtilError(
+      "Path is not a directory".to_owned(),
+    ));
+  }
+
+  let dir_name = if let Some(val) = from.components().last() {
+    val.as_os_str()
+  } else {
+    return Err(crate::Error::PathUtilError(
+      "Invalid Folder form".to_owned(),
+    ));
+  };
+  let mut to: PathBuf = to.as_ref().to_path_buf();
+  if !options.content_only && (!options.copy_files || to.exists()) {
+    to.push(dir_name);
+  }
+
+  let mut read_options = DirOpts::default();
+  if options.depth > 0 {
+    read_options.depth = options.depth;
+  }
+
+  let dir_content = get_dir_info(from, &read_options)?;
+  for directory in dir_content.directories {
+    let tmp_to = Path::new(&directory).strip_prefix(from)?;
+    let dir = to.join(tmp_to);
+    if !dir.exists() {
+      if options.copy_files {
+        create_all(dir, false)?;
+      } else {
+        create(dir, false)?;
+      }
+    }
+  }
+  let mut result: u64 = 0;
+  for file in dir_content.files {
+    let to = to.to_path_buf();
+    let tp = Path::new(&file).strip_prefix(from)?;
+    let path = to.join(tp);
+
+    let file_options = FileOpts {
+      overwrite: options.overwrite,
+      skip: options.skip,
+      buffer_size: options.buffer_size,
+    };
+    let mut result_copy: crate::Result<u64>;
+    let mut work = true;
+
+    while work {
+      #[allow(clippy::needless_borrow)]
+      {
+        result_copy = copy_file(&file, &path, &file_options);
+      }
+      match result_copy {
+        Ok(val) => {
+          result += val;
+          work = false;
+        }
+        Err(err) => {
+          let err_msg = err.to_string();
+          return Err(crate::Error::PathUtilError(err_msg));
+        }
+      }
+    }
+  }
+  Ok(result)
+}
+
+/// Gets the DirInfo from the directory path with the given options.
+pub fn get_dir_info<P>(path: P, options: &DirOpts) -> crate::Result<DirInfo>
+where
+  P: AsRef<Path>,
+{
+  let depth = if options.depth == 0 {
+    0
+  } else {
+    options.depth + 1
+  };
+
+  _get_dir_info(path, depth)
+}
+
+/// Gets the DirInfo from the directory with the given depth.
+fn _get_dir_info<P>(path: P, mut depth: u64) -> crate::Result<DirInfo>
+where
+  P: AsRef<Path>,
+{
+  let mut directories = Vec::new();
+  let mut files = Vec::new();
+  let mut size = 0;
+  let item = path.as_ref().to_str();
+  if item.is_none() {
+    return Err(crate::Error::PathUtilError("Invalid Path".to_owned()));
+  }
+  let item = item.expect("Item had no data").to_string();
+
+  if path.as_ref().is_dir() {
+    directories.push(item);
+    if depth == 0 || depth > 1 {
+      if depth > 1 {
+        depth -= 1;
+      }
+      for entry in read_dir(&path)? {
+        let _path = entry?.path();
+
+        match _get_dir_info(_path, depth) {
+          Ok(items) => {
+            let mut _files = items.files;
+            let mut _directories = items.directories;
+            size += items.size;
+            files.append(&mut _files);
+            directories.append(&mut _directories);
+          }
+          Err(err) => return Err(err),
+        }
+      }
+    }
+  } else {
+    size = path.as_ref().metadata()?.len();
+    files.push(item);
+  }
+  Ok(DirInfo {
+    size,
+    files,
+    directories,
+  })
+}

crates/tauri-bundler/src/bundle/platform.rs

@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::utils::CommandExt;
+use super::common::CommandExt;
 use std::process::Command;
 
 // Copyright 2019-2024 Tauri Programme within The Commons Conservancy
@@ -57,8 +57,6 @@ pub fn target_triple() -> Result<String, crate::Error> {
         "armv7".into()
       } else if cfg!(target_arch = "aarch64") {
         "aarch64".into()
-      } else if cfg!(target_arch = "riscv64") {
-        "riscv64".into()
       } else {
         return Err(crate::Error::ArchError(String::from(
           "Unable to determine target-architecture",

crates/tauri-bundler/src/bundle/settings.rs

@@ -4,14 +4,11 @@
 // SPDX-License-Identifier: MIT
 
 use super::category::AppCategory;
-use crate::{bundle::platform::target_triple, error::Context, utils::fs_utils};
+use crate::bundle::{common, platform::target_triple};
+use anyhow::Context;
 pub use tauri_utils::config::WebviewInstallMode;
 use tauri_utils::{
-  config::{
-    BundleType, DeepLinkProtocol, FileAssociation, NSISInstallerMode, NsisCompression,
-    RpmCompression,
-  },
-  platform::Target as TargetPlatform,
+  config::{BundleType, DeepLinkProtocol, FileAssociation, NSISInstallerMode, NsisCompression},
   resources::{external_binaries, ResourcePaths},
 };
 
@@ -173,8 +170,6 @@ pub struct DebianSettings {
   // OS-specific settings:
   /// the list of debian dependencies.
   pub depends: Option<Vec<String>>,
-  /// the list of debian dependencies recommendations.
-  pub recommends: Option<Vec<String>>,
   /// the list of dependencies the package provides.
   pub provides: Option<Vec<String>>,
   /// the list of package conflicts.
@@ -220,10 +215,6 @@ pub struct DebianSettings {
 pub struct AppImageSettings {
   /// The files to include in the Appimage Binary.
   pub files: HashMap<PathBuf, PathBuf>,
-  /// Whether to include gstreamer plugins for audio/media support.
-  pub bundle_media_framework: bool,
-  /// Whether to include the `xdg-open` binary.
-  pub bundle_xdg_open: bool,
 }
 
 /// The RPM bundle settings.
@@ -231,15 +222,13 @@ pub struct AppImageSettings {
 pub struct RpmSettings {
   /// The list of RPM dependencies your application relies on.
   pub depends: Option<Vec<String>>,
-  /// the list of RPM dependencies your application recommends.
-  pub recommends: Option<Vec<String>>,
   /// The list of RPM dependencies your application provides.
   pub provides: Option<Vec<String>>,
   /// The list of RPM dependencies your application conflicts with. They must not be present
   /// in order for the package to be installed.
   pub conflicts: Option<Vec<String>>,
   /// The list of RPM dependencies your application supersedes - if this package is installed,
-  /// packages listed as "obsoletes" will be automatically removed (if they are present).
+  /// packages listed as “obsoletes” will be automatically removed (if they are present).
   pub obsoletes: Option<Vec<String>>,
   /// The RPM release tag.
   pub release: String,
@@ -269,8 +258,6 @@ pub struct RpmSettings {
   /// Path to script that will be executed after the package is removed. See
   /// <http://ftp.rpm.org/max-rpm/s1-rpm-inside-scripts.html>
   pub post_remove_script: Option<PathBuf>,
-  /// Compression algorithm and level. Defaults to `Gzip` with level 6.
-  pub compression: Option<RpmCompression>,
 }
 
 /// Position coordinates struct.
@@ -306,13 +293,6 @@ pub struct DmgSettings {
   pub application_folder_position: Position,
 }
 
-/// The iOS bundle settings.
-#[derive(Clone, Debug, Default)]
-pub struct IosSettings {
-  /// The version of the build that identifies an iteration of the bundle.
-  pub bundle_version: Option<String>,
-}
-
 /// The macOS bundle settings.
 #[derive(Clone, Debug, Default)]
 pub struct MacOsSettings {
@@ -330,12 +310,6 @@ pub struct MacOsSettings {
   /// List of custom files to add to the application bundle.
   /// Maps the path in the Contents directory in the app to the path of the file to include (relative to the current working directory).
   pub files: HashMap<PathBuf, PathBuf>,
-  /// The version of the build that identifies an iteration of the bundle.
-  pub bundle_version: Option<String>,
-  /// The name of the build that identifies a string of the bundle.
-  ///
-  /// If not set, defaults to the package's product name.
-  pub bundle_name: Option<String>,
   /// A version string indicating the minimum MacOS version that the bundled app supports (e.g. `"10.11"`).
   /// If you are using this config field, you may also want have your `build.rs` script emit `cargo:rustc-env=MACOSX_DEPLOYMENT_TARGET=10.11`.
   pub minimum_system_version: Option<String>,
@@ -345,43 +319,16 @@ pub struct MacOsSettings {
   pub exception_domain: Option<String>,
   /// Code signing identity.
   pub signing_identity: Option<String>,
-  /// Whether to wait for notarization to finish and `staple` the ticket onto the app.
-  ///
-  /// Gatekeeper will look for stapled tickets to tell whether your app was notarized without
-  /// reaching out to Apple's servers which is helpful in offline environments.
-  ///
-  /// Enabling this option will also result in `tauri build` not waiting for notarization to finish
-  /// which is helpful for the very first time your app is notarized as this can take multiple hours.
-  /// On subsequent runs, it's recommended to disable this setting again.
-  pub skip_stapling: bool,
   /// Preserve the hardened runtime version flag, see <https://developer.apple.com/documentation/security/hardened_runtime>
   ///
   /// Settings this to `false` is useful when using an ad-hoc signature, making it less strict.
   pub hardened_runtime: bool,
   /// Provider short name for notarization.
   pub provider_short_name: Option<String>,
-  /// Path or contents of the entitlements.plist file.
-  pub entitlements: Option<Entitlements>,
-  /// Path to the Info.plist file or raw plist value to merge with the bundle Info.plist.
-  pub info_plist: Option<PlistKind>,
-}
-
-/// Entitlements for macOS code signing.
-#[derive(Debug, Clone)]
-pub enum Entitlements {
   /// Path to the entitlements.plist file.
-  Path(PathBuf),
-  /// Raw plist::Value.
-  Plist(plist::Value),
-}
-
-/// Plist format.
-#[derive(Debug, Clone)]
-pub enum PlistKind {
-  /// Path to a .plist file.
-  Path(PathBuf),
-  /// Raw plist value.
-  Plist(plist::Value),
+  pub entitlements: Option<String>,
+  /// Path to the Info.plist file for the bundle.
+  pub info_plist_path: Option<PathBuf>,
 }
 
 /// Configuration for a target language for the WiX build.
@@ -404,15 +351,6 @@ impl Default for WixLanguage {
 /// Settings specific to the WiX implementation.
 #[derive(Clone, Debug, Default)]
 pub struct WixSettings {
-  /// MSI installer version in the format `major.minor.patch.build` (build is optional).
-  ///
-  /// Because a valid version is required for MSI installer, it will be derived from [`PackageSettings::version`] if this field is not set.
-  ///
-  /// The first field is the major version and has a maximum value of 255. The second field is the minor version and has a maximum value of 255.
-  /// The third and fourth fields have a maximum value of 65,535.
-  ///
-  /// See <https://learn.microsoft.com/en-us/windows/win32/msi/productversion> for more info.
-  pub version: Option<String>,
   /// A GUID upgrade code for MSI installer. This code **_must stay the same across all of your updates_**,
   /// otherwise, Windows will treat your update as a different app and your users will have duplicate versions of your app.
   ///
@@ -448,7 +386,7 @@ pub struct WixSettings {
   pub banner_path: Option<PathBuf>,
   /// Path to a bitmap file to use on the installation user interface dialogs.
   /// It is used on the welcome and completion dialogs.
-  ///
+
   /// The required dimensions are 493px × 312px.
   pub dialog_image_path: Option<PathBuf>,
   /// Enables FIPS compliant algorithms.
@@ -563,7 +501,6 @@ pub struct WindowsSettings {
   /// Nsis configuration.
   pub nsis: Option<NsisSettings>,
   /// The path to the application icon. Defaults to `./icons/icon.ico`.
-  #[deprecated = "This is used for the MSI installer and will be removed in 3.0.0, use `BundleSettings::icon` field and make sure a `.ico` icon exists instead."]
   pub icon_path: PathBuf,
   /// The installation mode for the Webview2 runtime.
   pub webview_install_mode: WebviewInstallMode,
@@ -589,30 +526,19 @@ pub struct WindowsSettings {
   pub sign_command: Option<CustomSignCommandSettings>,
 }
 
-impl WindowsSettings {
-  pub(crate) fn can_sign(&self) -> bool {
-    self.sign_command.is_some() || self.certificate_thumbprint.is_some()
-  }
-}
-
-#[allow(deprecated)]
-mod _default {
-  use super::*;
-
-  impl Default for WindowsSettings {
-    fn default() -> Self {
-      Self {
-        digest_algorithm: None,
-        certificate_thumbprint: None,
-        timestamp_url: None,
-        tsp: false,
-        wix: None,
-        nsis: None,
-        icon_path: PathBuf::from("icons/icon.ico"),
-        webview_install_mode: Default::default(),
-        allow_downgrades: true,
-        sign_command: None,
-      }
+impl Default for WindowsSettings {
+  fn default() -> Self {
+    Self {
+      digest_algorithm: None,
+      certificate_thumbprint: None,
+      timestamp_url: None,
+      tsp: false,
+      wix: None,
+      nsis: None,
+      icon_path: PathBuf::from("icons/icon.ico"),
+      webview_install_mode: Default::default(),
+      allow_downgrades: true,
+      sign_command: None,
     }
   }
 }
@@ -689,8 +615,6 @@ pub struct BundleSettings {
   pub rpm: RpmSettings,
   /// DMG-specific settings.
   pub dmg: DmgSettings,
-  /// iOS-specific settings.
-  pub ios: IosSettings,
   /// MacOS-specific settings.
   pub macos: MacOsSettings,
   /// Updater configuration.
@@ -771,8 +695,6 @@ pub enum Arch {
   Armhf,
   /// For the AArch32 / ARM32 instruction sets with soft-float (32 bits).
   Armel,
-  /// For the RISC-V instruction sets (64 bits).
-  Riscv64,
   /// For universal macOS applications.
   Universal,
 }
@@ -797,12 +719,8 @@ pub struct Settings {
   bundle_settings: BundleSettings,
   /// the binaries to bundle.
   binaries: Vec<BundleBinary>,
-  /// The target platform.
-  target_platform: TargetPlatform,
   /// The target triple.
   target: String,
-  /// Whether to disable code signing during the bundling process.
-  no_sign: bool,
 }
 
 /// A builder for [`Settings`].
@@ -816,7 +734,6 @@ pub struct SettingsBuilder {
   binaries: Vec<BundleBinary>,
   target: Option<String>,
   local_tools_directory: Option<PathBuf>,
-  no_sign: bool,
 }
 
 impl SettingsBuilder {
@@ -886,13 +803,6 @@ impl SettingsBuilder {
     self
   }
 
-  /// Sets whether to skip code signing.
-  #[must_use]
-  pub fn no_sign(mut self, no_sign: bool) -> Self {
-    self.no_sign = no_sign;
-    self
-  }
-
   /// Builds a Settings from the CLI args.
   ///
   /// Package settings will be read from Cargo.toml.
@@ -904,7 +814,6 @@ impl SettingsBuilder {
     } else {
       target_triple()?
     };
-    let target_platform = TargetPlatform::from_triple(&target);
 
     Ok(Settings {
       log_level: self.log_level.unwrap_or(log::Level::Error),
@@ -922,12 +831,10 @@ impl SettingsBuilder {
           .bundle_settings
           .external_bin
           .as_ref()
-          .map(|bins| external_binaries(bins, &target, &target_platform)),
+          .map(|bins| external_binaries(bins, &target)),
         ..self.bundle_settings
       },
-      target_platform,
       target,
-      no_sign: self.no_sign,
     })
   }
 }
@@ -953,11 +860,6 @@ impl Settings {
     &self.target
   }
 
-  /// Returns the [`TargetPlatform`].
-  pub fn target_platform(&self) -> &TargetPlatform {
-    &self.target_platform
-  }
-
   /// Returns the architecture for the binary being bundled (e.g. "arm", "x86" or "x86_64").
   pub fn binary_arch(&self) -> Arch {
     if self.target.starts_with("x86_64") {
@@ -970,8 +872,6 @@ impl Settings {
       Arch::Armel
     } else if self.target.starts_with("aarch64") {
       Arch::AArch64
-    } else if self.target.starts_with("riscv64") {
-      Arch::Riscv64
     } else if self.target.starts_with("universal") {
       Arch::Universal
     } else {
@@ -986,15 +886,7 @@ impl Settings {
       .iter()
       .find(|bin| bin.main)
       .context("failed to find main binary, make sure you have a `package > default-run` in the Cargo.toml file")
-  }
-
-  /// Returns the file name of the binary being bundled.
-  pub fn main_binary_mut(&mut self) -> crate::Result<&mut BundleBinary> {
-    self
-      .binaries
-      .iter_mut()
-      .find(|bin| bin.main)
-      .context("failed to find main binary, make sure you have a `package > default-run` in the Cargo.toml file")
+      .map_err(Into::into)
   }
 
   /// Returns the file name of the binary being bundled.
@@ -1005,27 +897,24 @@ impl Settings {
       .find(|bin| bin.main)
       .context("failed to find main binary, make sure you have a `package > default-run` in the Cargo.toml file")
       .map(|b| b.name())
+      .map_err(Into::into)
   }
 
   /// Returns the path to the specified binary.
   pub fn binary_path(&self, binary: &BundleBinary) -> PathBuf {
-    let target_os = self.target_platform();
+    let target_os = self
+      .target()
+      .split('-')
+      .nth(2)
+      .unwrap_or(std::env::consts::OS);
 
-    let mut path = self.project_out_directory.join(binary.name());
+    let path = self.project_out_directory.join(binary.name());
 
-    if matches!(target_os, TargetPlatform::Windows) {
-      // Append the `.exe` extension without overriding the existing extensions
-      let extension = if let Some(extension) = path.extension() {
-        let mut extension = extension.to_os_string();
-        extension.push(".exe");
-        extension
-      } else {
-        "exe".into()
-      };
-      path.set_extension(extension);
-    };
-
-    path
+    if target_os == "windows" {
+      path.with_extension("exe")
+    } else {
+      path
+    }
   }
 
   /// Returns the list of binaries to bundle.
@@ -1043,13 +932,18 @@ impl Settings {
   ///
   /// Fails if the host/target's native package type is not supported.
   pub fn package_types(&self) -> crate::Result<Vec<PackageType>> {
-    let target_os = self.target_platform();
+    let target_os = self
+      .target
+      .split('-')
+      .nth(2)
+      .unwrap_or(std::env::consts::OS)
+      .replace("darwin", "macos");
 
-    let platform_types = match target_os {
-      TargetPlatform::MacOS => vec![PackageType::MacOsBundle, PackageType::Dmg],
-      TargetPlatform::Ios => vec![PackageType::IosBundle],
-      TargetPlatform::Linux => vec![PackageType::Deb, PackageType::Rpm, PackageType::AppImage],
-      TargetPlatform::Windows => vec![PackageType::WindowsMsi, PackageType::Nsis],
+    let platform_types = match target_os.as_str() {
+      "macos" => vec![PackageType::MacOsBundle, PackageType::Dmg],
+      "ios" => vec![PackageType::IosBundle],
+      "linux" => vec![PackageType::Deb, PackageType::Rpm, PackageType::AppImage],
+      "windows" => vec![PackageType::WindowsMsi, PackageType::Nsis],
       os => {
         return Err(crate::Error::GenericError(format!(
           "Native {os} bundles not yet supported."
@@ -1136,7 +1030,7 @@ impl Settings {
           .to_string_lossy()
           .replace(&format!("-{}", self.target), ""),
       );
-      fs_utils::copy_file(&src, &dest)?;
+      common::copy_file(&src, &dest)?;
       paths.push(dest);
     }
     Ok(paths)
@@ -1147,7 +1041,7 @@ impl Settings {
     for resource in self.resource_files().iter() {
       let resource = resource?;
       let dest = path.join(resource.target());
-      fs_utils::copy_file(resource.path(), &dest)?;
+      common::copy_file(resource.path(), dest)?;
     }
     Ok(())
   }
@@ -1254,11 +1148,6 @@ impl Settings {
     &self.bundle_settings.dmg
   }
 
-  /// Returns the iOS settings.
-  pub fn ios(&self) -> &IosSettings {
-    &self.bundle_settings.ios
-  }
-
   /// Returns the MacOS settings.
   pub fn macos(&self) -> &MacOsSettings {
     &self.bundle_settings.macos
@@ -1273,14 +1162,4 @@ impl Settings {
   pub fn updater(&self) -> Option<&UpdaterSettings> {
     self.bundle_settings.updater.as_ref()
   }
-
-  /// Whether to skip signing.
-  pub fn no_sign(&self) -> bool {
-    self.no_sign
-  }
-
-  /// Set whether to skip signing.
-  pub fn set_no_sign(&mut self, no_sign: bool) {
-    self.no_sign = no_sign;
-  }
 }

crates/tauri-bundler/src/bundle/updater_bundle.rs

@@ -3,6 +3,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
+use super::common;
+
 use crate::{
   bundle::{
     windows::{
@@ -11,11 +13,9 @@ use crate::{
     },
     Bundle,
   },
-  error::{Context, ErrorExt},
-  utils::fs_utils,
   Settings,
 };
-use tauri_utils::{display_path, platform::Target as TargetPlatform};
+use tauri_utils::display_path;
 
 use std::{
   fs::{self, File},
@@ -23,13 +23,19 @@ use std::{
   path::{Path, PathBuf},
 };
 
+use anyhow::Context;
 use zip::write::SimpleFileOptions;
 
 // Build update
 pub fn bundle_project(settings: &Settings, bundles: &[Bundle]) -> crate::Result<Vec<PathBuf>> {
-  let target_os = settings.target_platform();
+  let target_os = settings
+    .target()
+    .split('-')
+    .nth(2)
+    .unwrap_or(std::env::consts::OS)
+    .replace("darwin", "macos");
 
-  if matches!(target_os, TargetPlatform::Windows) {
+  if target_os == "windows" {
     return bundle_update_windows(settings, bundles);
   }
 
@@ -188,7 +194,7 @@ fn bundle_update_windows(settings: &Settings, bundles: &[Bundle]) -> crate::Resu
           p.push(c);
           (p, b)
         });
-    let archived_path = archived_path.with_extension(format!("{bundle_name}.zip"));
+    let archived_path = archived_path.with_extension(format!("{}.zip", bundle_name));
 
     log::info!(action = "Bundling"; "{}", display_path(&archived_path));
 
@@ -204,7 +210,7 @@ fn bundle_update_windows(settings: &Settings, bundles: &[Bundle]) -> crate::Resu
 pub fn create_zip(src_file: &Path, dst_file: &Path) -> crate::Result<PathBuf> {
   let parent_dir = dst_file.parent().expect("No data in parent");
   fs::create_dir_all(parent_dir)?;
-  let writer = fs_utils::create_file(dst_file)?;
+  let writer = common::create_file(dst_file)?;
 
   let file_name = src_file
     .file_name()
@@ -216,9 +222,7 @@ pub fn create_zip(src_file: &Path, dst_file: &Path) -> crate::Result<PathBuf> {
     .unix_permissions(0o755);
 
   zip.start_file(file_name.to_string_lossy(), options)?;
-  let mut f =
-    File::open(src_file).fs_context("failed to open updater ZIP file", src_file.to_path_buf())?;
-
+  let mut f = File::open(src_file)?;
   let mut buffer = Vec::new();
   f.read_to_end(&mut buffer)?;
   zip.write_all(&buffer)?;
@@ -231,7 +235,7 @@ pub fn create_zip(src_file: &Path, dst_file: &Path) -> crate::Result<PathBuf> {
 fn create_tar(src_dir: &Path, dest_path: &Path) -> crate::Result<PathBuf> {
   use flate2::{write::GzEncoder, Compression};
 
-  let dest_file = fs_utils::create_file(dest_path)?;
+  let dest_file = common::create_file(dest_path)?;
   let gzip_encoder = GzEncoder::new(dest_file, Compression::default());
 
   let gzip_encoder = create_tar_from_src(src_dir, gzip_encoder)?;

crates/tauri-bundler/src/bundle/windows/mod.rs

@@ -5,7 +5,6 @@
 
 #[cfg(target_os = "windows")]
 pub mod msi;
-
 pub mod nsis;
 pub mod sign;
 

crates/tauri-bundler/src/bundle/windows/msi/main.wxs

@@ -70,12 +70,9 @@
         <Property Id="ARPURLUPDATEINFO" Value="{{homepage}}"/>
         {{/if}}
 
+        <!-- initialize with previous InstallDir -->
         <Property Id="INSTALLDIR">
-          <!-- First attempt: Search for "InstallDir" -->
-          <RegistrySearch Id="PrevInstallDirWithName" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="InstallDir" Type="raw" />
-
-          <!-- Second attempt: If the first fails, search for the default key value (this is how the nsis installer currently stores the path) -->
-          <RegistrySearch Id="PrevInstallDirNoName" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Type="raw" />
+            <RegistrySearch Id="PrevInstallDirReg" Root="HKCU" Key="Software\\{{manufacturer}}\\{{product_name}}" Name="InstallDir" Type="raw"/>
         </Property>
 
         <!-- launch app checkbox -->

crates/tauri-bundler/src/bundle/windows/msi/mod.rs

@@ -3,30 +3,24 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-License-Identifier: MIT
 
-use crate::{
-  bundle::{
-    settings::{Arch, Settings},
-    windows::{
-      sign::{should_sign, try_sign},
-      util::{
-        download_webview2_bootstrapper, download_webview2_offline_installer,
-        WIX_OUTPUT_FOLDER_NAME, WIX_UPDATER_OUTPUT_FOLDER_NAME,
-      },
+use crate::bundle::{
+  common::CommandExt,
+  path_utils::{copy_file, FileOpts},
+  settings::{Arch, Settings},
+  windows::{
+    sign::try_sign,
+    util::{
+      download_and_verify, download_webview2_bootstrapper, download_webview2_offline_installer,
+      extract_zip, HashAlgorithm, WIX_OUTPUT_FOLDER_NAME, WIX_UPDATER_OUTPUT_FOLDER_NAME,
     },
   },
-  error::Context,
-  utils::{
-    fs_utils::copy_file,
-    http_utils::{download_and_verify, extract_zip, HashAlgorithm},
-    CommandExt,
-  },
 };
+use anyhow::{bail, Context};
 use handlebars::{html_escape, to_json, Handlebars};
 use regex::Regex;
 use serde::{Deserialize, Serialize};
 use std::{
   collections::{BTreeMap, HashMap, HashSet},
-  ffi::OsStr,
   fs::{self, File},
   io::Write,
   path::{Path, PathBuf},
@@ -177,7 +171,7 @@ impl ResourceDirectory {
       directories.push_str(wix_string.as_str());
     }
     let wix_string = if self.name.is_empty() {
-      format!("{files}{directories}")
+      format!("{}{}", files, directories)
     } else {
       format!(
         r#"<Directory Id="I{id}" Name="{name}">{files}{directories}</Directory>"#,
@@ -203,7 +197,14 @@ fn copy_icon(settings: &Settings, filename: &str, path: &Path) -> crate::Result<
 
   let icon_path = std::env::current_dir()?.join(path);
 
-  copy_file(&icon_path, &icon_target_path)?;
+  copy_file(
+    icon_path,
+    &icon_target_path,
+    &FileOpts {
+      overwrite: true,
+      ..Default::default()
+    },
+  )?;
 
   Ok(icon_target_path)
 }
@@ -221,7 +222,8 @@ fn app_installer_output_path(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "Unsupported architecture: {target:?}"
+        "Unsupported architecture: {:?}",
+        target
       )))
     }
   };
@@ -279,40 +281,19 @@ fn clear_env_for_wix(cmd: &mut Command) {
   }
 }
 
-fn validate_wix_version(version_str: &str) -> crate::Result<()> {
-  let components = version_str
-    .split('.')
-    .flat_map(|c| c.parse::<u64>().ok())
-    .collect::<Vec<_>>();
-
-  if components.len() < 3 {
-    crate::error::bail!(
-      "app wix version should be in the format major.minor.patch.build (build is optional)"
-    );
-  }
-
-  if components[0] > 255 {
-    crate::error::bail!("app version major number cannot be greater than 255");
-  }
-  if components[1] > 255 {
-    crate::error::bail!("app version minor number cannot be greater than 255");
-  }
-  if components[2] > 65535 {
-    crate::error::bail!("app version patch number cannot be greater than 65535");
-  }
-
-  if components.len() == 4 && components[3] > 65535 {
-    crate::error::bail!("app version build number cannot be greater than 65535");
-  }
-
-  Ok(())
-}
-
 // WiX requires versions to be numeric only in a `major.minor.patch.build` format
-fn convert_version(version_str: &str) -> crate::Result<String> {
-  let version = semver::Version::parse(version_str)
-    .map_err(Into::into)
-    .context("invalid app version")?;
+pub fn convert_version(version_str: &str) -> anyhow::Result<String> {
+  let version = semver::Version::parse(version_str).context("invalid app version")?;
+  if version.major > 255 {
+    bail!("app version major number cannot be greater than 255");
+  }
+  if version.minor > 255 {
+    bail!("app version minor number cannot be greater than 255");
+  }
+  if version.patch > 65535 {
+    bail!("app version patch number cannot be greater than 65535");
+  }
+
   if !version.build.is_empty() {
     let build = version.build.parse::<u64>();
     if build.map(|b| b <= 65535).unwrap_or_default() {
@@ -321,7 +302,7 @@ fn convert_version(version_str: &str) -> crate::Result<String> {
         version.major, version.minor, version.patch, version.build
       ));
     } else {
-      crate::error::bail!("optional build metadata in app version must be numeric-only and cannot be greater than 65535 for msi target");
+      bail!("optional build metadata in app version must be numeric-only and cannot be greater than 65535 for msi target");
     }
   }
 
@@ -333,7 +314,7 @@ fn convert_version(version_str: &str) -> crate::Result<String> {
         version.major, version.minor, version.patch, version.pre
       ));
     } else {
-      crate::error::bail!("optional pre-release identifier in app version must be numeric-only and cannot be greater than 65535 for msi target");
+      bail!("optional pre-release identifier in app version must be numeric-only and cannot be greater than 65535 for msi target");
     }
   }
 
@@ -354,7 +335,8 @@ fn run_candle(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "unsupported architecture: {target:?}"
+        "unsupported architecture: {:?}",
+        target
       )))
     }
   };
@@ -390,7 +372,11 @@ fn run_candle(
     cmd.arg(ext);
   }
   clear_env_for_wix(&mut cmd);
-  cmd.args(&args).current_dir(cwd).output_ok()?;
+  cmd
+    .args(&args)
+    .current_dir(cwd)
+    .output_ok()
+    .context("error running candle.exe")?;
 
   Ok(())
 }
@@ -415,7 +401,11 @@ fn run_light(
     cmd.arg(ext);
   }
   clear_env_for_wix(&mut cmd);
-  cmd.args(&args).current_dir(build_path).output_ok()?;
+  cmd
+    .args(&args)
+    .current_dir(build_path)
+    .output_ok()
+    .context("error running light.exe")?;
 
   Ok(())
 }
@@ -436,23 +426,13 @@ pub fn build_wix_app_installer(
     Arch::AArch64 => "arm64",
     target => {
       return Err(crate::Error::ArchError(format!(
-        "unsupported architecture: {target:?}"
+        "unsupported architecture: {:?}",
+        target
       )))
     }
   };
 
-  let app_version = if let Some(version) = settings
-    .windows()
-    .wix
-    .as_ref()
-    .and_then(|wix| wix.version.clone())
-  {
-    version
-  } else {
-    convert_version(settings.version_string())?
-  };
-
-  validate_wix_version(&app_version)?;
+  let app_version = convert_version(settings.version_string())?;
 
   // target only supports x64.
   log::info!("Target: {}", arch);
@@ -464,15 +444,6 @@ pub fn build_wix_app_installer(
   }
   fs::create_dir_all(&output_path)?;
 
-  // when we're performing code signing, we'll sign some WiX DLLs, so we make a local copy
-  let wix_toolset_path = if settings.windows().can_sign() {
-    let wix_path = output_path.join("wix");
-    crate::utils::fs_utils::copy_dir(wix_toolset_path, &wix_path)?;
-    wix_path
-  } else {
-    wix_toolset_path.to_path_buf()
-  };
-
   let mut data = BTreeMap::new();
 
   let silent_webview_install = if let WebviewInstallMode::DownloadBootstrapper { silent }
@@ -633,17 +604,7 @@ pub fn build_wix_app_installer(
   data.insert("main_binary_path", to_json(main_binary_path));
 
   // copy icon from `settings.windows().icon_path` folder to resource folder near msi
-  #[allow(deprecated)]
-  let icon_path = if !settings.windows().icon_path.as_os_str().is_empty() {
-    settings.windows().icon_path.clone()
-  } else {
-    settings
-      .icon_files()
-      .flatten()
-      .find(|i| i.extension() == Some(OsStr::new("ico")))
-      .context("Couldn't find a .ico icon")?
-  };
-  let icon_path = copy_icon(settings, "icon.ico", &icon_path)?;
+  let icon_path = copy_icon(settings, "icon.ico", &settings.windows().icon_path)?;
 
   data.insert("icon_path", to_json(icon_path));
 
@@ -697,9 +658,7 @@ pub fn build_wix_app_installer(
       .iter()
       .flat_map(|p| &p.schemes)
       .collect::<Vec<_>>();
-    if !schemes.is_empty() {
-      data.insert("deep_link_protocols", to_json(schemes));
-    }
+    data.insert("deep_link_protocols", to_json(schemes));
   }
 
   if let Some(path) = custom_template_path {
@@ -727,54 +686,58 @@ pub fn build_wix_app_installer(
     );
 
     // Create the update task XML
-    let skip_uac_task = Handlebars::new();
+    let mut skip_uac_task = Handlebars::new();
     let xml = include_str!("./update-task.xml");
-    let update_content = skip_uac_task.render_template(xml, &data)?;
+    skip_uac_task
+      .register_template_string("update.xml", xml)
+      .map_err(|e| e.to_string())
+      .expect("Failed to setup Update Task handlebars");
     let temp_xml_path = output_path.join("update.xml");
+    let update_content = skip_uac_task.render("update.xml", &data)?;
     fs::write(temp_xml_path, update_content)?;
 
     // Create the Powershell script to install the task
     let mut skip_uac_task_installer = Handlebars::new();
     skip_uac_task_installer.register_escape_fn(handlebars::no_escape);
     let xml = include_str!("./install-task.ps1");
-    let install_script_content = skip_uac_task_installer.render_template(xml, &data)?;
+    skip_uac_task_installer
+      .register_template_string("install-task.ps1", xml)
+      .map_err(|e| e.to_string())
+      .expect("Failed to setup Update Task Installer handlebars");
     let temp_ps1_path = output_path.join("install-task.ps1");
+    let install_script_content = skip_uac_task_installer.render("install-task.ps1", &data)?;
     fs::write(temp_ps1_path, install_script_content)?;
 
     // Create the Powershell script to uninstall the task
     let mut skip_uac_task_uninstaller = Handlebars::new();
     skip_uac_task_uninstaller.register_escape_fn(handlebars::no_escape);
     let xml = include_str!("./uninstall-task.ps1");
-    let install_script_content = skip_uac_task_uninstaller.render_template(xml, &data)?;
+    skip_uac_task_uninstaller
+      .register_template_string("uninstall-task.ps1", xml)
+      .map_err(|e| e.to_string())
+      .expect("Failed to setup Update Task Uninstaller handlebars");
     let temp_ps1_path = output_path.join("uninstall-task.ps1");
+    let install_script_content = skip_uac_task_uninstaller.render("uninstall-task.ps1", &data)?;
     fs::write(temp_ps1_path, install_script_content)?;
 
     data.insert("enable_elevated_update_task", to_json(true));
   }
 
   let main_wxs_path = output_path.join("main.wxs");
-  fs::write(&main_wxs_path, handlebars.render("main.wxs", &data)?)?;
+  fs::write(main_wxs_path, handlebars.render("main.wxs", &data)?)?;
 
-  let mut candle_inputs = vec![];
+  let mut candle_inputs = vec![("main.wxs".into(), Vec::new())];
 
   let current_dir = std::env::current_dir()?;
   let extension_regex = Regex::new("\"http://schemas.microsoft.com/wix/(\\w+)\"")?;
-  let input_paths =
-    std::iter::once(main_wxs_path).chain(fragment_paths.iter().map(|p| current_dir.join(p)));
-
-  for input_path in input_paths {
-    let input_content = fs::read_to_string(&input_path)?;
-    let input_handlebars = Handlebars::new();
-    let input = input_handlebars.render_template(&input_content, &data)?;
+  for fragment_path in fragment_paths {
+    let fragment_path = current_dir.join(fragment_path);
+    let fragment = fs::read_to_string(&fragment_path)?;
     let mut extensions = Vec::new();
-    for cap in extension_regex.captures_iter(&input) {
-      let path = wix_toolset_path.join(format!("Wix{}.dll", &cap[1]));
-      if settings.windows().can_sign() {
-        try_sign(&path, settings)?;
-      }
-      extensions.push(path);
+    for cap in extension_regex.captures_iter(&fragment) {
+      extensions.push(wix_toolset_path.join(format!("Wix{}.dll", &cap[1])));
     }
-    candle_inputs.push((input_path, extensions));
+    candle_inputs.push((fragment_path, extensions));
   }
 
   let mut fragment_extensions = HashSet::new();
@@ -782,18 +745,11 @@ pub fn build_wix_app_installer(
   fragment_extensions.insert(wix_toolset_path.join("WixUIExtension.dll"));
   fragment_extensions.insert(wix_toolset_path.join("WixUtilExtension.dll"));
 
-  // sign default extensions
-  if settings.windows().can_sign() {
-    for path in &fragment_extensions {
-      try_sign(path, settings)?;
-    }
-  }
-
   for (path, extensions) in candle_inputs {
     for ext in &extensions {
       fragment_extensions.insert(ext.clone());
     }
-    run_candle(settings, &wix_toolset_path, &output_path, path, extensions)?;
+    run_candle(settings, wix_toolset_path, &output_path, path, extensions)?;
   }
 
   let mut output_paths = Vec::new();
@@ -840,7 +796,7 @@ pub fn build_wix_app_installer(
 
     let locale_contents = locale_contents.replace(
       "</WixLocalization>",
-      &format!("{unset_locale_strings}</WixLocalization>"),
+      &format!("{}</WixLocalization>", unset_locale_strings),
     );
     let locale_path = output_path.join("locale.wxl");
     {
@@ -869,7 +825,7 @@ pub fn build_wix_app_installer(
     log::info!(action = "Running"; "light to produce {}", display_path(&msi_path));
 
     run_light(
-      &wix_toolset_path,
+      wix_toolset_path,
       &output_path,
       arguments,
       &(fragment_extensions.clone().into_iter().collect()),
@@ -877,7 +833,7 @@ pub fn build_wix_app_installer(
     )?;
     fs::rename(&msi_output_path, &msi_path)?;
 
-    if settings.windows().can_sign() {
+    if settings.can_sign() {
       try_sign(&msi_path, settings)?;
     }
 
@@ -945,11 +901,12 @@ fn get_merge_modules(settings: &Settings) -> crate::Result<Vec<MergeModule>> {
   let mut merge_modules = Vec::new();
   let regex = Regex::new(r"[^\w\d\.]")?;
   for msm in glob::glob(
-    &PathBuf::from(glob::Pattern::escape(
-      &settings.project_out_directory().to_string_lossy(),
-    ))
-    .join("*.msm")
-    .to_string_lossy(),
+    settings
+      .project_out_directory()
+      .join("*.msm")
+      .to_string_lossy()
+      .to_string()
+      .as_str(),
   )? {
     let path = msm?;
     let filename = path
@@ -984,11 +941,8 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
     if added_resources.contains(&resource_path) {
       continue;
     }
-    added_resources.push(resource_path.clone());
 
-    if settings.windows().can_sign() && should_sign(&resource_path)? {
-      try_sign(&resource_path, settings)?;
-    }
+    added_resources.push(resource_path.clone());
 
     let resource_entry = ResourceFile {
       id: format!("I{}", Uuid::new_v4().as_simple()),
@@ -1059,13 +1013,8 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
 
   let mut dlls = Vec::new();
 
-  // TODO: The bundler should not include all DLLs it finds. Instead it should only include WebView2Loader.dll if present and leave the rest to the resources config.
   let out_dir = settings.project_out_directory();
-  for dll in glob::glob(
-    &PathBuf::from(glob::Pattern::escape(&out_dir.to_string_lossy()))
-      .join("*.dll")
-      .to_string_lossy(),
-  )? {
+  for dll in glob::glob(out_dir.join("*.dll").to_string_lossy().to_string().as_str())? {
     let path = dll?;
     let resource_path = dunce::simplified(&path);
     let relative_path = path
@@ -1074,10 +1023,6 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
       .to_string_lossy()
       .into_owned();
     if !added_resources.iter().any(|r| r.ends_with(&relative_path)) {
-      if settings.windows().can_sign() {
-        try_sign(resource_path, settings)?;
-      }
-
       dlls.push(ResourceFile {
         id: format!("I{}", Uuid::new_v4().as_simple()),
         guid: Uuid::new_v4().to_string(),
@@ -1087,48 +1032,16 @@ fn generate_resource_data(settings: &Settings) -> crate::Result<ResourceMap> {
   }
 
   if !dlls.is_empty() {
-    resources
-      .entry("".to_string())
-      .and_modify(|r| r.files.append(&mut dlls))
-      .or_insert(ResourceDirectory {
+    resources.insert(
+      "".to_string(),
+      ResourceDirectory {
         path: "".to_string(),
         name: "".to_string(),
         directories: vec![],
         files: dlls,
-      });
+      },
+    );
   }
 
   Ok(resources)
 }
-
-#[cfg(test)]
-mod tests {
-  use super::*;
-
-  #[test]
-  fn validates_wix_version() {
-    assert!(validate_wix_version("1.1.1").is_ok());
-    assert!(validate_wix_version("1.1.1.1").is_ok());
-    assert!(validate_wix_version("255.1.1.1").is_ok());
-    assert!(validate_wix_version("1.255.1.1").is_ok());
-    assert!(validate_wix_version("1.1.65535.1").is_ok());
-    assert!(validate_wix_version("1.1.1.65535").is_ok());
-
-    assert!(validate_wix_version("256.1.1.1").is_err());
-    assert!(validate_wix_version("1.256.1.1").is_err());
-    assert!(validate_wix_version("1.1.65536.1").is_err());
-    assert!(validate_wix_version("1.1.1.65536").is_err());
-  }
-
-  #[test]
-  fn converts_version_to_wix() {
-    assert_eq!(convert_version("1.1.2").unwrap(), "1.1.2");
-    assert_eq!(convert_version("1.1.2-4").unwrap(), "1.1.2.4");
-    assert_eq!(convert_version("1.1.2-65535").unwrap(), "1.1.2.65535");
-    assert_eq!(convert_version("1.1.2+2").unwrap(), "1.1.2.2");
-
-    assert!(convert_version("1.1.2-alpha").is_err());
-    assert!(convert_version("1.1.2-alpha.4").is_err());
-    assert!(convert_version("1.1.2+asd.3").is_err());
-  }
-}

crates/tauri-bundler/src/bundle/windows/msi/update-task.xml

@@ -37,7 +37,7 @@
   <Actions Context="Author">
     <Exec>
       <Command>cmd.exe</Command>
-      <Arguments>/c ^"%SYSTEMROOT%\System32\msiexec.exe /i "%TEMP%\\{{product_name}}.msi" {{msiexec_args}} /promptrestart^"</Arguments>
+      <Arguments>/c "%SYSTEMROOT%\System32\msiexec.exe /i %TEMP%\\{{product_name}}.msi {{msiexec_args}} /promptrestart"</Arguments>
     </Exec>
   </Actions>
 </Task>

crates/tauri-bundler/src/bundle/windows/nsis/installer.nsi

@@ -47,7 +47,7 @@ ${StrLoc}
 !define COPYRIGHT "{{copyright}}"
 !define OUTFILE "{{out_file}}"
 !define ARCH "{{arch}}"
-!define ADDITIONALPLUGINSPATH "{{additional_plugins_path}}"
+!define PLUGINSPATH "{{additional_plugins_path}}"
 !define ALLOWDOWNGRADES "{{allow_downgrades}}"
 !define DISPLAYLANGUAGESELECTOR "{{display_language_selector}}"
 !define INSTALLWEBVIEW2MODE "{{install_webview2_mode}}"
@@ -56,8 +56,7 @@ ${StrLoc}
 !define WEBVIEW2INSTALLERPATH "{{webview2_installer_path}}"
 !define MINIMUMWEBVIEW2VERSION "{{minimum_webview2_version}}"
 !define UNINSTKEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCTNAME}"
-!define MANUKEY "Software\${MANUFACTURER}"
-!define MANUPRODUCTKEY "${MANUKEY}\${PRODUCTNAME}"
+!define MANUPRODUCTKEY "Software\${MANUFACTURER}\${PRODUCTNAME}"
 !define UNINSTALLERSIGNCOMMAND "{{uninstaller_sign_cmd}}"
 !define ESTIMATEDSIZE "{{estimated_size}}"
 !define STARTMENUFOLDER "{{start_menu_folder}}"
@@ -85,8 +84,10 @@ VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 VIAddVersionKey "ProductVersion" "${VERSION}"
 
-# additional plugins
-!addplugindir "${ADDITIONALPLUGINSPATH}"
+; Plugins path, currently exists for linux only
+!if "${PLUGINSPATH}" != ""
+    !addplugindir "${PLUGINSPATH}"
+!endif
 
 ; Uninstaller signing command
 !if "${UNINSTALLERSIGNCOMMAND}" != ""
@@ -95,7 +96,7 @@ VIAddVersionKey "ProductVersion" "${VERSION}"
 
 ; Handle install mode, `perUser`, `perMachine` or `both`
 !if "${INSTALLMODE}" == "perMachine"
-  RequestExecutionLevel admin
+  RequestExecutionLevel highest
 !endif
 
 !if "${INSTALLMODE}" == "currentUser"
@@ -618,7 +619,7 @@ Section Install
     !insertmacro NSIS_HOOK_PREINSTALL
   !endif
 
-  !insertmacro CheckIfAppIsRunning "${MAINBINARYNAME}.exe" "${PRODUCTNAME}"
+  !insertmacro CheckIfAppIsRunning
 
   ; Copy main executable
   File "${MAINBINARYSRCPATH}"
@@ -628,12 +629,12 @@ Section Install
     CreateDirectory "$INSTDIR\\{{this}}"
   {{/each}}
   {{#each resources}}
-    File /a "/oname={{this.[1]}}" "{{no-escape @key}}"
+    File /a "/oname={{this.[1]}}" "{{@key}}"
   {{/each}}
 
   ; Copy external binaries
   {{#each binaries}}
-    File /a "/oname={{this}}" "{{no-escape @key}}"
+    File /a "/oname={{this}}" "{{@key}}"
   {{/each}}
 
   ; Create file associations
@@ -755,7 +756,7 @@ Section Uninstall
     !insertmacro NSIS_HOOK_PREUNINSTALL
   !endif
 
-  !insertmacro CheckIfAppIsRunning "${MAINBINARYNAME}.exe" "${PRODUCTNAME}"
+  !insertmacro CheckIfAppIsRunning
 
   ; Delete the app directory and its content from disk
   ; Copy main executable
@@ -833,27 +834,12 @@ Section Uninstall
     DeleteRegKey HKCU "${UNINSTKEY}"
   !endif
 
-  ; Removes the Autostart entry for ${PRODUCTNAME} from the HKCU Run key if it exists.
-  ; This ensures the program does not launch automatically after uninstallation if it exists.
-  ; If it doesn't exist, it does nothing.
-  ; We do this when not updating (to preserve the registry value on updates)
-  ${If} $UpdateMode <> 1
-    DeleteRegValue HKCU "Software\Microsoft\Windows\CurrentVersion\Run" "${PRODUCTNAME}"
-  ${EndIf}
+  DeleteRegValue HKCU "${MANUPRODUCTKEY}" "Installer Language"
 
   ; Delete app data if the checkbox is selected
   ; and if not updating
   ${If} $DeleteAppDataCheckboxState = 1
   ${AndIf} $UpdateMode <> 1
-    ; Clear the install location $INSTDIR from registry
-    DeleteRegKey SHCTX "${MANUPRODUCTKEY}"
-    DeleteRegKey /ifempty SHCTX "${MANUKEY}"
-
-    ; Clear the install language from registry
-    DeleteRegValue HKCU "${MANUPRODUCTKEY}" "Installer Language"
-    DeleteRegKey /ifempty HKCU "${MANUPRODUCTKEY}"
-    DeleteRegKey /ifempty HKCU "${MANUKEY}"
-
     SetShellVarContext current
     RmDir /r "$APPDATA\${BUNDLEID}"
     RmDir /r "$LOCALAPPDATA\${BUNDLEID}"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Arabic.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_ARABIC} "إضافة أو إزالة المكونات"
 LangString alreadyInstalled ${LANG_ARABIC} "التطبيق مثبت بالفعل"
 LangString alreadyInstalledLong ${LANG_ARABIC} "${PRODUCTNAME} ${VERSION} مثبت بالفعل. قم باختيار العملية التى تريدها ثم اضغط على التالى."
-LangString appRunning ${LANG_ARABIC} "{{product_name}} مازال يعمل! من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى."
-LangString appRunningOkKill ${LANG_ARABIC} "{{product_name}} مازال يعمل!$\nاضغط OK لإغلاقه"
+LangString appRunning ${LANG_ARABIC} "${PRODUCTNAME} مازال يعمل! من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى."
+LangString appRunningOkKill ${LANG_ARABIC} "${PRODUCTNAME} مازال يعمل!$\nاضغط OK لإغلاقه"
 LangString chooseMaintenanceOption ${LANG_ARABIC} "قم باختيار نوع الصيانة التى تريدها."
 LangString choowHowToInstall ${LANG_ARABIC} "قم باختيار طريقة تنصيب ${PRODUCTNAME}."
 LangString createDesktop ${LANG_ARABIC} "اضف اختصار على سطح المكتب"
 LangString dontUninstall ${LANG_ARABIC} "عدم إزالة"
 LangString dontUninstallDowngrade ${LANG_ARABIC} "عدم إزالة (التخفيض بدون إزالة غير مسموح لهذا المثبت)"
-LangString failedToKillApp ${LANG_ARABIC} "فشل فى غلف {{product_name}}. من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى."
+LangString failedToKillApp ${LANG_ARABIC} "فشل فى غلف ${PRODUCTNAME}. من فضلك، قم بإغلاق التطبيق أولاً ثم حاول مرة أخرى."
 LangString installingWebview2 ${LANG_ARABIC} "تنصيب WebView2..."
 LangString newerVersionInstalled ${LANG_ARABIC} "يوجد نسخة جديدة من ${PRODUCTNAME} مثبتة بالغعل! لا ينصح بتنصيب نسخة اقدم من النسخة الحالية. اذا مازلت ترغب فى تنصيب النسخة الأقدم، فينصح بإزالة النسخة الحالية أولاً. قم باختيار العملية التى تريدها ثم اضغط على التالى للاستمرار."
 LangString older ${LANG_ARABIC} "أقدم"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Bulgarian.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_BULGARIAN} "Добавяне/Преинсталиране на компоненти"
 LangString alreadyInstalled ${LANG_BULGARIAN} "Вече инсталиран"
 LangString alreadyInstalledLong ${LANG_BULGARIAN} "${PRODUCTNAME} ${VERSION} е вече е инсталиран. Изберете операцията, която искате да извършите и натиснете Напред, за да продължите."
-LangString appRunning ${LANG_BULGARIAN} "{{product_name}} е отворен! Моля, затворете го първо и опитайте отново."
-LangString appRunningOkKill ${LANG_BULGARIAN} "{{product_name}} е отворен!$\nНатиснете ОК, за да го затворите."
+LangString appRunning ${LANG_BULGARIAN} "${PRODUCTNAME} е отворен! Моля, затворете го първо и опитайте отново."
+LangString appRunningOkKill ${LANG_BULGARIAN} "${PRODUCTNAME} е отворен!$\nНатиснете ОК, за да го затворите."
 LangString chooseMaintenanceOption ${LANG_BULGARIAN} "Изберете опция за поддръжка."
 LangString choowHowToInstall ${LANG_BULGARIAN} "Изберете как искате да инсталирате ${PRODUCTNAME}."
 LangString createDesktop ${LANG_BULGARIAN} "Създайте пряк път на работния плот"
 LangString dontUninstall ${LANG_BULGARIAN} "Не деинсталирайте"
 LangString dontUninstallDowngrade ${LANG_BULGARIAN} "Не деинсталирайте (Понижаването без деинсталация е забранено за този инсталатор)"
-LangString failedToKillApp ${LANG_BULGARIAN} "Неуспешно прекратяване на {{product_name}}. Моля, затворете го първо и опитайте отново."
+LangString failedToKillApp ${LANG_BULGARIAN} "Неуспешно прекратяване на ${PRODUCTNAME}. Моля, затворете го първо и опитайте отново."
 LangString installingWebview2 ${LANG_BULGARIAN} "Инсталиране на WebView2..."
 LangString newerVersionInstalled ${LANG_BULGARIAN} "Вече е инсталирана по-нова версия на ${PRODUCTNAME}! Не се препоръчва да инсталирате по-стара версия. Ако наистина желаете да инсталирате тази по-стара версия, по-добре е да деинсталирате текущата версия първо. Изберете операцията, която искате да извършите и натиснете Напред, за да продължите."
 LangString older ${LANG_BULGARIAN} "по-стара"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Dutch.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_DUTCH} "(Her)installeer componenten"
 LangString alreadyInstalled ${LANG_DUTCH} "Al geïnstalleerd"
 LangString alreadyInstalledLong ${LANG_DUTCH} "${PRODUCTNAME} ${VERSION} is al geïnstalleerd. Kies een van de volgende opties en klik op Volgende om door te gaan."
-LangString appRunning ${LANG_DUTCH} "{{product_name}} is geopend! Sluit het programma eerst en probeer het dan opnieuw."
-LangString appRunningOkKill ${LANG_DUTCH} "{{product_name}} is geopend!$\nKlik op OK om het te stoppen."
+LangString appRunning ${LANG_DUTCH} "${PRODUCTNAME} is geopend! Sluit het programma eerst en probeer het dan opnieuw."
+LangString appRunningOkKill ${LANG_DUTCH} "${PRODUCTNAME} is geopend!$\nKlik op OK om het te stoppen."
 LangString chooseMaintenanceOption ${LANG_DUTCH} "Kies de onderhoudsoptie die u wilt uitvoeren."
 LangString choowHowToInstall ${LANG_DUTCH} "Kies hoe u ${PRODUCTNAME} wilt installeren."
 LangString createDesktop ${LANG_DUTCH} "Maak een snelkoppeling aan op het bureaublad"
 LangString dontUninstall ${LANG_DUTCH} "Deïnstalleer niet"
 LangString dontUninstallDowngrade ${LANG_DUTCH} "Deïnstalleer niet (Downgraden zonder deïnstalleren is uitgeschakeld voor deze installer)"
-LangString failedToKillApp ${LANG_DUTCH} "Het is niet gelukt {{product_name}} te stoppen. Sluit het eerst zelf en probeer het dan nog een keer"
+LangString failedToKillApp ${LANG_DUTCH} "Het is niet gelukt ${PRODUCTNAME} te stoppen. Sluit het eerst zelf en probeer het dan nog een keer"
 LangString installingWebview2 ${LANG_DUTCH} "WebView2 wordt geïnstalleerd..."
 LangString newerVersionInstalled ${LANG_DUTCH} "Een nieuwere versie van ${PRODUCTNAME} is al geïnstalleerd! Het word niet aangeraden om een oudere versie te installeren. Als u echt deze oudere versie wilt installeren, kunt u beter de huidige versie eerst deïnstalleren. Kies een van de volgende opties en klik op Volgende om door te gaan."
 LangString older ${LANG_DUTCH} "oudere"

crates/tauri-bundler/src/bundle/windows/nsis/languages/English.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_ENGLISH} "Add/Reinstall components"
 LangString alreadyInstalled ${LANG_ENGLISH} "Already Installed"
 LangString alreadyInstalledLong ${LANG_ENGLISH} "${PRODUCTNAME} ${VERSION} is already installed. Select the operation you want to perform and click Next to continue."
-LangString appRunning ${LANG_ENGLISH} "{{product_name}} is running! Please close it first then try again."
-LangString appRunningOkKill ${LANG_ENGLISH} "{{product_name}} is running!$\nClick OK to kill it"
+LangString appRunning ${LANG_ENGLISH} "${PRODUCTNAME} is running! Please close it first then try again."
+LangString appRunningOkKill ${LANG_ENGLISH} "${PRODUCTNAME} is running!$\nClick OK to kill it"
 LangString chooseMaintenanceOption ${LANG_ENGLISH} "Choose the maintenance option to perform."
 LangString choowHowToInstall ${LANG_ENGLISH} "Choose how you want to install ${PRODUCTNAME}."
 LangString createDesktop ${LANG_ENGLISH} "Create desktop shortcut"
 LangString dontUninstall ${LANG_ENGLISH} "Do not uninstall"
 LangString dontUninstallDowngrade ${LANG_ENGLISH} "Do not uninstall (Downgrading without uninstall is disabled for this installer)"
-LangString failedToKillApp ${LANG_ENGLISH} "Failed to kill {{product_name}}. Please close it first then try again"
+LangString failedToKillApp ${LANG_ENGLISH} "Failed to kill ${PRODUCTNAME}. Please close it first then try again"
 LangString installingWebview2 ${LANG_ENGLISH} "Installing WebView2..."
 LangString newerVersionInstalled ${LANG_ENGLISH} "A newer version of ${PRODUCTNAME} is already installed! It is not recommended that you install an older version. If you really want to install this older version, it's better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
 LangString older ${LANG_ENGLISH} "older"

crates/tauri-bundler/src/bundle/windows/nsis/languages/French.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_FRENCH} "Ajouter/Réinstaller un composant."
 LangString alreadyInstalled ${LANG_FRENCH} "Déja installé."
 LangString alreadyInstalledLong ${LANG_FRENCH} "${PRODUCTNAME} ${VERSION} est déja installé. Sélectionnez l'opération que vous souhaitez effectuer, puis cliquez sur Suivant pour continuer."
-LangString appRunning ${LANG_FRENCH} "{{product_name}} est en cours d'exécution. Veuillez fermer l'application avant de réessayer."
-LangString appRunningOkKill ${LANG_FRENCH} "{{product_name}} est en cours d'exécution.$\nCliquez sur OK pour fermer l'application."
+LangString appRunning ${LANG_FRENCH} "${PRODUCTNAME} est en cours d'exécution. Veuillez fermer l'application avant de réessayer."
+LangString appRunningOkKill ${LANG_FRENCH} "${PRODUCTNAME} est en cours d'exécution.$\nCliquez sur OK pour fermer l'application."
 LangString chooseMaintenanceOption ${LANG_FRENCH} "Veuillez choisir l'option de maintenance à effectuer."
 LangString choowHowToInstall ${LANG_FRENCH} "Veuillez choisir l'emplacement d'installation de ${PRODUCTNAME}."
 LangString createDesktop ${LANG_FRENCH} "Créer un raccourci sur le bureau."
 LangString dontUninstall ${LANG_FRENCH} "Ne pas désinstaller"
 LangString dontUninstallDowngrade ${LANG_FRENCH} "Ne pas désinstaller (revenir à une ancienne version sans désinstallation est désactivé pour cet installateur)"
-LangString failedToKillApp ${LANG_FRENCH} "La fermeture de {{product_name}} a échoué. Veuillez fermer l'application et réessayer."
+LangString failedToKillApp ${LANG_FRENCH} "La fermeture de ${PRODUCTNAME} a échoué. Veuillez fermer l'application et réessayer."
 LangString installingWebview2 ${LANG_FRENCH} "Installation de WebView2..."
 LangString newerVersionInstalled ${LANG_FRENCH} "Une version plus récente de ${PRODUCTNAME} est déja installée. Il n'est pas recommandé d'installer une ancienne version. Si vous souhaitez installer cette ancienne version, il est conseillé de désinstaller la version courante en premier. Veuillez sélectionner l'opération que vous souhaitez effectuer, puis cliquez sur Suivant pour continer."
 LangString older ${LANG_FRENCH} "ancien"

crates/tauri-bundler/src/bundle/windows/nsis/languages/German.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_GERMAN} "Komponenten hinzufügen/neu installieren"
 LangString alreadyInstalled ${LANG_GERMAN} "Bereits installiert"
 LangString alreadyInstalledLong ${LANG_GERMAN} "${PRODUCTNAME} ${VERSION} ist bereits installiert. Wählen Sie den gewünschten Vorgang aus und klicken Sie auf Weiter, um fortzufahren."
-LangString appRunning ${LANG_GERMAN} "{{product_name}} wird ausgeführt! Bitte schließen Sie es zuerst und versuchen Sie es dann erneut."
-LangString appRunningOkKill ${LANG_GERMAN} "{{product_name}} läuft! $\nKlicken Sie auf OK, um es zu beenden"
+LangString appRunning ${LANG_GERMAN} "${PRODUCTNAME} wird ausgeführt! Bitte schließen Sie es zuerst und versuchen Sie es dann erneut."
+LangString appRunningOkKill ${LANG_GERMAN} "${PRODUCTNAME} läuft! $\nKlicken Sie auf OK, um es zu beenden"
 LangString chooseMaintenanceOption ${LANG_GERMAN} "Wählen Sie die auszuführende Wartungsoption."
 LangString choowHowToInstall ${LANG_GERMAN} "Wählen Sie, wie Sie ${PRODUCTNAME} installieren möchten."
 LangString createDesktop ${LANG_GERMAN} "Desktop-Verknüpfung erstellen"
 LangString dontUninstall ${LANG_GERMAN} "Nicht deinstallieren"
 LangString dontUninstallDowngrade ${LANG_GERMAN} "Nicht deinstallieren (Downgrading ohne Deinstallation ist für dieses Installationsprogramm deaktiviert)"
-LangString failedToKillApp ${LANG_GERMAN} "Failed to kill {{product_name}}. Bitte schließen Sie es zuerst und versuchen Sie es dann erneut"
+LangString failedToKillApp ${LANG_GERMAN} "Failed to kill ${PRODUCTNAME}. Bitte schließen Sie es zuerst und versuchen Sie es dann erneut"
 LangString installingWebview2 ${LANG_GERMAN} "Installiere WebView2..."
 LangString newerVersionInstalled ${LANG_GERMAN} "Eine neuere Version von ${PRODUCTNAME} ist bereits installiert! Es wird nicht empfohlen, eine ältere Version zu installieren. Wenn Sie diese ältere Version wirklich installieren wollen, ist es besser, die aktuelle Version zuerst zu deinstallieren. Wählen Sie den gewünschten Vorgang aus und klicken Sie auf Weiter, um fortzufahren."
 LangString älter ${LANG_GERMAN} "älter"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Hebrew.nsh

@@ -1,27 +0,0 @@
-LangString addOrReinstall ${LANG_HEBREW} "הוסף או התקן מחדש"
-LangString alreadyInstalled ${LANG_HEBREW} "כבר מותקן"
-LangString alreadyInstalledLong ${LANG_HEBREW} "${PRODUCTNAME} ${VERSION} כבר מותקן. בחר את הפעולה שברצונך לבצע ולחץ על הבא כדי להמשיך."
-LangString appRunning ${LANG_HEBREW} "{{product_name}} פועל! נא לסגור אותו ולנסות שוב."
-LangString appRunningOkKill ${LANG_HEBREW} "{{product_name}} פועל!$\nלחץ אישור כדי לסגור אותו."
-LangString chooseMaintenanceOption ${LANG_HEBREW} "בחר את פעולת התחזוקה לביצוע"
-LangString choowHowToInstall ${LANG_HEBREW} "בחר איך תרצה להתקין את ${PRODUCTNAME}."
-LangString createDesktop ${LANG_HEBREW} "צור קיצור דרך בשולחן העבודה"
-LangString dontUninstall ${LANG_HEBREW} "אל תסיר"
-LangString dontUninstallDowngrade ${LANG_HEBREW} "אל תסיר (התקנת גרסה ישנה ללא הסרת הגרסה הנוכחית מושעית עבור התקנה זו)"
-LangString failedToKillApp ${LANG_HEBREW} "עצירת {{product_name}} נכשלה. נא לסגור את היישום ולנסות שוב."
-LangString installingWebview2 ${LANG_HEBREW} "מתקין את WebView2..."
-LangString newerVersionInstalled ${LANG_HEBREW} "גרסה חדשה יותר של ${PRODUCTNAME} כבר מותקנת! לא מומלץ להתקין גרסה ישנה. אם בכל זאת תרצה להתקין את הגרסה הזו, מומלץ קודם להסיר את הגרסה הנוכחית. בחר את הפעולה שברצונך לבצע ולחץ הבא להמשך."
-LangString older ${LANG_HEBREW} "ישנה"
-LangString olderOrUnknownVersionInstalled ${LANG_HEBREW} "גרסה $R4 של ${PRODUCTNAME} מותקנת במערכת שלך. מומלץ להסיר את הגרסה הנוכחית לפני ההתקנה. בחר את הפעולה שברצונך לבצע ולחץ הבא להמשך."
-LangString silentDowngrades ${LANG_HEBREW} "התקנת גרסה ישנה לא נתמכת בהתקנה זו, אין אפשרות להמשיך עם ההתקנה השקטה, נא להמשיך עם ההתקנה בממשק הגרפי.$\n"
-LangString unableToUninstall ${LANG_HEBREW} "לא ניתן להסיר!"
-LangString uninstallApp ${LANG_HEBREW} "הסר את ${PRODUCTNAME}"
-LangString uninstallBeforeInstalling ${LANG_HEBREW} "הסר את הגרסה הנוכחית לפני התקנת גרסה זו"
-LangString unknown ${LANG_HEBREW} "לא ידועה"
-LangString webview2AbortError ${LANG_HEBREW} "התקנת WebView2 נכשלה! היישום אינו יכולה לפעול בלי זה. נסה להפעיל את ההתקנה שוב."
-LangString webview2DownloadError ${LANG_HEBREW} "שגיאה: הורדת WebView2 נכשלה - $0"
-LangString webview2DownloadSuccess ${LANG_HEBREW} "מאתחל WebView2 הורד בהצלחה"
-LangString webview2Downloading ${LANG_HEBREW} "מוריד את מאתחל WebView2..."
-LangString webview2InstallError ${LANG_HEBREW} "שגיאה: התקנת WebView2 נכשלה עם קוד שגיאה $1"
-LangString webview2InstallSuccess ${LANG_HEBREW} "WebView2 הותקן בהצלחה"
-LangString deleteAppData ${LANG_HEBREW} "מחק את נתוני היישום"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Italian.nsh

@@ -1,27 +0,0 @@
-LangString addOrReinstall ${LANG_ITALIAN} "Aggiungi/Reinstalla componenti"
-LangString alreadyInstalled ${LANG_ITALIAN} "Già installato"
-LangString alreadyInstalledLong ${LANG_ITALIAN} "${PRODUCTNAME} ${VERSION} è già installato. Seleziona l'operazione che vuoi eseguire e clicca Avanti per continuare."
-LangString appRunning ${LANG_ITALIAN} "{{product_name}} è in esecuzione! Chiudi e poi riprova."
-LangString appRunningOkKill ${LANG_ITALIAN} "{{product_name}} è in esecuzione!$\nSeleziona OK per chiuderlo"
-LangString chooseMaintenanceOption ${LANG_ITALIAN} "Seleziona l'operazione di manutenzione da eseguire."
-LangString choowHowToInstall ${LANG_ITALIAN} "Seleziona come vuoi installare ${PRODUCTNAME}."
-LangString createDesktop ${LANG_ITALIAN} "Crea scorciatoia sul Desktop"
-LangString dontUninstall ${LANG_ITALIAN} "Non disinstallare"
-LangString dontUninstallDowngrade ${LANG_ITALIAN} "Non disinstallare (Il downgrade senza la disinstallazione è disabilitato per questo installer)"
-LangString failedToKillApp ${LANG_ITALIAN} "Impossibile chiudere {{product_name}}. Chiudi e poi riprova"
-LangString installingWebview2 ${LANG_ITALIAN} "Installando WebView2..."
-LangString newerVersionInstalled ${LANG_ITALIAN} "Una versione più recente di ${PRODUCTNAME} è già installata! Non è consigliato installare una versione più vecchia. Se vuoi comunque procedere, è meglio prima disinstallare la versione corrente. Seleziona l'operazione che vuoi eseguire e clicca Avanti per continuare."
-LangString older ${LANG_ITALIAN} "più vecchia"
-LangString olderOrUnknownVersionInstalled ${LANG_ITALIAN} "Una versione $R4 di ${PRODUCTNAME} è installata nel tuo sistema. È consigliato che disinstalli la versione corrente prima di procedere all'installazione. Seleziona l'operazione che vuoi eseguire e clicca Avanti per continuare."
-LangString silentDowngrades ${LANG_ITALIAN} "I downgrade sono disabilitati per questo installer, impossibile procedere con l'installer silenzioso, usa invece l'installer con interfaccia grafica.$\n"
-LangString unableToUninstall ${LANG_ITALIAN} "Impossibile disinstallare!"
-LangString uninstallApp ${LANG_ITALIAN} "Disinstalla ${PRODUCTNAME}"
-LangString uninstallBeforeInstalling ${LANG_ITALIAN} "Disinstalla prima di installare"
-LangString unknown ${LANG_ITALIAN} "sconosciuta"
-LangString webview2AbortError ${LANG_ITALIAN} "Errore nell'installazione di WebView2! L'app non può funzionare senza. Prova a riavviare l'installer."
-LangString webview2DownloadError ${LANG_ITALIAN} "Errore: Il download di WebView2 è fallito - $0"
-LangString webview2DownloadSuccess ${LANG_ITALIAN} "Bootstrapper WebView2 scaricato con successo"
-LangString webview2Downloading ${LANG_ITALIAN} "Scaricando il bootstrapper WebView2..."
-LangString webview2InstallError ${LANG_ITALIAN} "Errore: L'installazione di WebView2 è fallita con il codice $1"
-LangString webview2InstallSuccess ${LANG_ITALIAN} "WebView2 installato correttamente"
-LangString deleteAppData ${LANG_ITALIAN} "Cancella i dati dell'applicazione"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Japanese.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_JAPANESE} "コンポーネントの追加・再インストール"
 LangString alreadyInstalled ${LANG_JAPANESE} "既にインストールされています"
 LangString alreadyInstalledLong ${LANG_JAPANESE} "${PRODUCTNAME} ${VERSION} は既にインストールされています。実行したい操作を選択し、「次へ」をクリックして続行します。"
-LangString appRunning ${LANG_JAPANESE} "{{product_name}} は動作中です。動作中のプログラムを終了し、もう一度やり直してください。"
-LangString appRunningOkKill ${LANG_JAPANESE} "{{product_name}} は動作中です。$\n「OK」を押すと動作中のプログラムを終了します。"
+LangString appRunning ${LANG_JAPANESE} "${PRODUCTNAME} は動作中です。動作中のプログラムを終了し、もう一度やり直してください。"
+LangString appRunningOkKill ${LANG_JAPANESE} "${PRODUCTNAME} は動作中です。$\n「OK」を押すと動作中のプログラムを終了します。"
 LangString chooseMaintenanceOption ${LANG_JAPANESE} "メンテナンスオプションを選択して実行します。"
 LangString choowHowToInstall ${LANG_JAPANESE} "${PRODUCTNAME} のインストール方法を選択してください。"
 LangString createDesktop ${LANG_JAPANESE} "デスクトップショートカットを作成する"
 LangString dontUninstall ${LANG_JAPANESE} "アンインストールしない"
 LangString dontUninstallDowngrade ${LANG_JAPANESE} "アンインストールしない (このインストーラーでは、アンインストールをせずにダウングレードすることはできません)"
-LangString failedToKillApp ${LANG_JAPANESE} "{{product_name}} の終了に失敗しました。動作中のプログラムを終了し、もう一度やり直してください。"
+LangString failedToKillApp ${LANG_JAPANESE} "${PRODUCTNAME} の終了に失敗しました。動作中のプログラムを終了し、もう一度やり直してください。"
 LangString installingWebview2 ${LANG_JAPANESE} "WebView2 をインストール中です..."
 LangString newerVersionInstalled ${LANG_JAPANESE} "既に新しいバージョンの ${PRODUCTNAME} がインストールされています。古いバージョンをインストールすることは推奨されません。どうしてもこの旧バージョンをインストールしたい場合は、先に現行バージョンをアンインストールしておく方がよいでしょう。実行したい操作を選択し、「次へ」をクリックして続行します。"
 LangString older ${LANG_JAPANESE} "旧"

crates/tauri-bundler/src/bundle/windows/nsis/languages/Korean.nsh

@@ -1,14 +1,14 @@
 LangString addOrReinstall ${LANG_KOREAN} "컴포넌트 추가 및 재설치"
 LangString alreadyInstalled ${LANG_KOREAN} "이미 설치되어 있습니다"
 LangString alreadyInstalledLong ${LANG_KOREAN} "${PRODUCTNAME} ${VERSION}이(가) 이미 설치되어 있습니다. 수행하고자 하는 작업을 선택하고 '다음'을 클릭하여 계속합니다."
-LangString appRunning ${LANG_KOREAN} "{{product_name}}이(가) 실행 중입니다! 먼저 닫은 후 다시 시도하세요."
-LangString appRunningOkKill ${LANG_KOREAN} "{{product_name}}이(가) 실행 중입니다!$\n'OK'를 누르면 실행 중인 프로그램을 종료합니다."
+LangString appRunning ${LANG_KOREAN} "${PRODUCTNAME}이(가) 실행 중입니다! 먼저 닫은 후 다시 시도하세요."
+LangString appRunningOkKill ${LANG_KOREAN} "${PRODUCTNAME}이(가) 실행 중입니다!$\n'OK'를 누르면 실행 중인 프로그램을 종료합니다."
 LangString chooseMaintenanceOption ${LANG_KOREAN} "수행하려는 관리 옵션을 선택합니다."
 LangString choowHowToInstall ${LANG_KOREAN} "${PRODUCTNAME}의 설치 방법을 선택하세요.."
 LangString createDesktop ${LANG_KOREAN} "바탕화면 바로가기 만들기"
 LangString dontUninstall ${LANG_KOREAN} "제거하지 않기"
 LangString dontUninstallDowngrade ${LANG_KOREAN} "제거하지 않기 (이 설치 프로그램에서는 제거하지 않고 다운그레이드할 수 없습니다.)"
-LangString failedToKillApp ${LANG_KOREAN} "{{product_name}}을(를) 종료하지 못했습니다. 먼저 닫은 후 다시 시도하세요."
+LangString failedToKillApp ${LANG_KOREAN} "${PRODUCTNAME}을(를) 종료하지 못했습니다. 먼저 닫은 후 다시 시도하세요."
 LangString installingWebview2 ${LANG_KOREAN} "WebView2를 설치하는 중입니다..."
 LangString newerVersionInstalled ${LANG_KOREAN} "${PRODUCTNAME}의 최신 버전이 이미 설치되어 있습니다! 이전 버전을 설치하지 않는 것이 좋습니다. 이 이전 버전을 꼭 설치하려면 먼저 현재 버전을 제거하는 것이 좋습니다. 수행하려는 작업을 선택하고 '다음'을 클릭하여 계속합니다."
 LangString older ${LANG_KOREAN} "구"