fix(deps): update rust crate globset to v0.4.18

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Topgrade is misbehaving
 title: ''
-type: Bug
+labels: 'C-bug'
 assignees: ''
 
 ---
@@ -14,65 +14,52 @@ Please make sure to
 before filing a new one!
 
 Questions labeled with `Optional` can be skipped.
+-->
 
+<!--
 If you're here to report about a "No asset found" error, please make sure that
 an hour has been passed since the last release was made.
 -->
 
-## Checklist
-
-- [ ] I have searched the issue tracker for relevant or duplicate issues.
-
 ## Erroneous Behavior
-
 <!--
 What actually happened?
 -->
 
 ## Expected Behavior
-
 <!--
-Describe the expected behavior.
+Describe the expected behavior
 -->
 
 ## Steps to reproduce
-
 <!--
-A minimal example to reproduce the issue.
+A minimal example to reproduce the issue
 -->
 
 ## Possible Cause (Optional)
-
 <!--
 If you know the possible cause of the issue, please tell us.
 -->
 
 ## Problem persists without calling from topgrade
-
 <!--
-Execute the erroneous command directly to see if the problem persists.
+Execute the erroneous command directly to see if the problem persists
 -->
-
 - [ ] Yes
 - [ ] No
 
-## Ran through `Remote Execution`
+## Did you run topgrade through `Remote Execution`
-
-<!--
-Did you run topgrade through `Remote Execution`?
--->
 
 - [ ] Yes
 - [ ] No
 
 If yes, does the issue still occur when you run topgrade directly in your
-remote host?
+remote host
 
 - [ ] Yes
 - [ ] No
 
 ## Configuration file (Optional)
-
 <!--
 Paste your configuration file inside the code block if you think this issue is
 related to configuration.
@@ -83,7 +70,6 @@ related to configuration.
 ```
 
 ## Additional Details
-
 - Operation System/Version
   <!-- For example, Fedora Linux 38 -->
 
@@ -96,7 +82,6 @@ related to configuration.
 - Topgrade version (`topgrade -V`)
 
 ## Verbose Output (`topgrade -v`)
-
 <!--
 Paste the verbose output into the pre-tags
 -->

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,15 +1,21 @@
 ---
-name: General feature request
+name: Feature request
-about: Suggest a general feature, or feature within an already existing step
+about: Can you please support...?
 title: ''
-type: Feature
+labels: 'C-feature request'
 assignees: ''
 
 ---
 
-## Checklist
+## I want to suggest a new step
 
-- [ ] I have searched the issue tracker for relevant or duplicate issues.
+* Which tool is this about? Where is its repository?
+* Which operating systems are supported by this tool?
+* What should Topgrade do to figure out if the tool needs to be invoked?
+* Which exact commands should Topgrade run?
+* Does it have a `--dry-run` option? i.e., print what should be done and exit
+* Does it need the user to confirm the execution? And does it provide a `--yes`
+  option to skip this step?
 
 ## I want to suggest some general feature
 
@@ -19,5 +25,3 @@ Topgrade should...
 
 <!-- Assuming that someone else implements the feature,
 please state if you know how to test it from a side branch of Topgrade. -->
-
-- [ ] I am able and willing to implement this feature myself

.github/ISSUE_TEMPLATE/step_request.md

@@ -1,30 +0,0 @@
----
-name: New step request
-about: Suggest a new step/package manager to update
-title: ''
-type: Feature
-labels: request step
-assignees: ''
-
----
-
-## Checklist
-
-- [ ] I have searched the issue tracker for relevant or duplicate issues.
-
-## I want to suggest a new step
-
-* Which tool is this about? Where is its repository?
-* Which operating systems are supported by this tool?
-* What should Topgrade do to figure out if the tool needs to be invoked?
-* Which exact commands should Topgrade run?
-* Does it have a `--dry-run` option? i.e., print what should be done and exit
-* Does it need the user to confirm the execution? And does it provide a `--yes`
-  option to skip this?
-
-## More information
-
-<!-- Assuming that someone else implements the step,
-please state if you know how to test it from a side branch of Topgrade. -->
-
-- [ ] I am able and willing to implement this step myself

.github/workflows/check_config_creation_if_not_exists.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/check_i18n.yml

@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/check_security_vulnerability.yml

@@ -24,7 +24,7 @@ jobs:
       security-events: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -32,6 +32,6 @@ jobs:
         uses: microsoft/DevSkim-Action@4b5047945a44163b94642a1cecc0d93a3f428cc6 # v1.0.16
 
       - name: Upload DevSkim scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: devskim-results.sarif

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -39,7 +39,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -135,7 +135,7 @@ jobs:
       matrix_target: ${{ matrix.target }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/create_release_assets.yml

@@ -33,7 +33,7 @@ jobs:
     env:
       tag: ${{ github.event.client_payload.tag }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -169,7 +169,7 @@ jobs:
       matrix_target: ${{ matrix.target }}
       tag: ${{ github.event.client_payload.tag }}
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/dependency-review.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 'Checkout Repository'
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/lint_pr.yml

@@ -1,12 +1,11 @@
 name: 'Lint PR'
 
 on:
-  pull_request_target: # zizmor: ignore[dangerous-triggers] this is the only way, and we're not running user code
+  pull_request_target:
     types:
       - opened
       - edited
       - reopened
-      - synchronize
 
 jobs:
   main:

.github/workflows/release-plz.yml

@@ -17,7 +17,7 @@ jobs:
       id-token: write  # For trusted publishing
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           fetch-depth: 0
           persist-credentials: false
@@ -53,7 +53,7 @@ jobs:
       cancel-in-progress: false
     steps:
       - name: Checkout repository
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
         with:
           fetch-depth: 0
           persist-credentials: false

.github/workflows/release_to_homebrew.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Bump formulae
-      uses: dawidd6/action-homebrew-bump-formula@c5ddc585e75f0f750a8b4f610688b4bec9e80915 # v6
+      uses: dawidd6/action-homebrew-bump-formula@3428a0601bba3173ec0bdcc945be23fa27aa4c31 # v5
       with:
         # Custom GitHub access token with only the 'public_repo' scope enabled
         token: ${{secrets.HOMEBREW_ACCESS_TOKEN}}

.github/workflows/release_to_pypi.yml

@@ -15,7 +15,7 @@ jobs:
       matrix:
         target: [x86_64, x86, aarch64]
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -37,7 +37,7 @@ jobs:
       matrix:
         target: [x64, x86]
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -58,7 +58,7 @@ jobs:
       matrix:
         target: [x86_64, aarch64]
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -76,7 +76,7 @@ jobs:
   sdist:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 

.github/workflows/scorecards.yml

@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
           persist-credentials: false
 
@@ -71,6 +71,6 @@ jobs:
 
       # Upload the results to GitHub's code scanning dashboard.
       - name: "Upload to code-scanning"
-        uses: github/codeql-action/upload-sarif@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
+        uses: github/codeql-action/upload-sarif@0499de31b99561a6d14a36a5f662c2a54f91beee # v4.31.2
         with:
           sarif_file: results.sarif

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 - repo: https://github.com/gitleaks/gitleaks
-  rev: v8.29.0
+  rev: v8.28.0
   hooks:
   - id: gitleaks
 
@@ -16,7 +16,7 @@ repos:
   - id: trailing-whitespace
 
 - repo: https://github.com/crate-ci/typos
-  rev: v1.39.2
+  rev: v1.38.1
   hooks:
   - id: typos
 

CHANGELOG.md

@@ -7,73 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [16.4.2](https://github.com/topgrade-rs/topgrade/compare/v16.4.1...v16.4.2) - 2025-11-20
-
-### Other
-
-- *(deps)* update dawidd6/action-homebrew-bump-formula action to v6 ([#1543](https://github.com/topgrade-rs/topgrade/pull/1543))
-
-## [16.4.1](https://github.com/topgrade-rs/topgrade/compare/v16.4.0...v16.4.1) - 2025-11-20
-
-### Other
-
-- refactor run_containers error handling ([#1541](https://github.com/topgrade-rs/topgrade/pull/1541))
-
-## [16.4.0](https://github.com/topgrade-rs/topgrade/compare/v16.3.0...v16.4.0) - 2025-11-20
-
-### Added
-
-- *(os)* add Origami Linux support ([#1530](https://github.com/topgrade-rs/topgrade/pull/1530))
-- *(containers)* add option to run `system prune` ([#1523](https://github.com/topgrade-rs/topgrade/pull/1523))
-
-### Fixed
-
-- *(deps)* restore custom commands order ([#1535](https://github.com/topgrade-rs/topgrade/pull/1535))
-
-### Other
-
-- *(deps)* update clap, clap_builder, clap_complete ([#1540](https://github.com/topgrade-rs/topgrade/pull/1540))
-- *(deps)* update github/codeql-action action to v4.31.4 ([#1531](https://github.com/topgrade-rs/topgrade/pull/1531))
-- *(config)* add custom commands order test ([#1536](https://github.com/topgrade-rs/topgrade/pull/1536))
-- make Config methods more consistent by utilizing `#[derive(Default)]` ([#1534](https://github.com/topgrade-rs/topgrade/pull/1534))
-- *(issue templates)* use issue types ([#1533](https://github.com/topgrade-rs/topgrade/pull/1533))
-- *(deps)* lock file maintenance ([#1505](https://github.com/topgrade-rs/topgrade/pull/1505))
-- *(deps)* update actions/checkout digest to 93cb6ef ([#1526](https://github.com/topgrade-rs/topgrade/pull/1526))
-- *(deps)* update actions/checkout action to v5.0.1 ([#1527](https://github.com/topgrade-rs/topgrade/pull/1527))
-
-## [16.3.0](https://github.com/topgrade-rs/topgrade/compare/v16.2.1...v16.3.0) - 2025-11-16
-
-### Added
-
-- print summary and run post commands when (q)uit is used ([#1254](https://github.com/topgrade-rs/topgrade/pull/1254))
-- run pre_sudo before pre_commands ([#1469](https://github.com/topgrade-rs/topgrade/pull/1469))
-- *(chezmoi)* add `exclude_encrypted` config ([#1453](https://github.com/topgrade-rs/topgrade/pull/1453))
-
-### Fixed
-
-- *(elan)* skip running elan update on elan >=4.0.0 ([#1507](https://github.com/topgrade-rs/topgrade/pull/1507))
-- *(deps)* Fix non-locked install on older version of Rust ([#1485](https://github.com/topgrade-rs/topgrade/pull/1485))
-- *(deps)* Fix non-locked install on older version of Rust ([#1482](https://github.com/topgrade-rs/topgrade/pull/1482))
-- *(bun)* skip self-update if not installed via official script ([#1476](https://github.com/topgrade-rs/topgrade/pull/1476))
-- *(openbsd)* fix compilation on OpenBSD ([#1473](https://github.com/topgrade-rs/topgrade/pull/1473))
-
-### Other
-
-- *(license)* switch license variant to GPL-3.0-or-later ([#1518](https://github.com/topgrade-rs/topgrade/pull/1518))
-- *(deps)* update some dependencies ([#1512](https://github.com/topgrade-rs/topgrade/pull/1512))
-- *(deps)* update github/codeql-action action to v4.31.3 ([#1483](https://github.com/topgrade-rs/topgrade/pull/1483))
-- remove unnecessary cfg-if dependency ([#1509](https://github.com/topgrade-rs/topgrade/pull/1509))
-- *(lint_pr)* run on synchronize, and add zizmor ignore ([#1508](https://github.com/topgrade-rs/topgrade/pull/1508))
-- *(pre-commit)* autoupdate ([#1464](https://github.com/topgrade-rs/topgrade/pull/1464))
-- improve issue templates ([#1235](https://github.com/topgrade-rs/topgrade/pull/1235))
-- *(deps)* bump mac-notification-sys, use main branch temporarily ([#1506](https://github.com/topgrade-rs/topgrade/pull/1506))
-- *(deps)* lock file maintenance ([#1481](https://github.com/topgrade-rs/topgrade/pull/1481))
-- *(deps)* pin dependencies ([#1478](https://github.com/topgrade-rs/topgrade/pull/1478))
-- *(deps)* update actions/dependency-review-action action to v4.8.2 ([#1479](https://github.com/topgrade-rs/topgrade/pull/1479))
-- Add Renovate ([#1477](https://github.com/topgrade-rs/topgrade/pull/1477))
-- Replace main's self update with a proper step call ([#1470](https://github.com/topgrade-rs/topgrade/pull/1470))
-- *(release)* Fix homebrew releases ([#1468](https://github.com/topgrade-rs/topgrade/pull/1468))
-
 ## [16.2.1](https://github.com/topgrade-rs/topgrade/compare/v16.2.0...v16.2.1) - 2025-11-10
 
 ### Fixed

Cargo.toml

@@ -3,10 +3,10 @@ name = "topgrade"
 description = "Upgrade all the things"
 categories = ["os"]
 keywords = ["upgrade", "update"]
-license = "GPL-3.0-or-later"
+license = "GPL-3.0"
 repository = "https://github.com/topgrade-rs/topgrade"
 rust-version = "1.84.1"
-version = "16.4.2"
+version = "16.2.1"
 authors = ["Roey Darwish Dror <roey.ghost@gmail.com>", "Thomas Schönauer <t.schoenauer@hgs-wt.at>"]
 exclude = ["doc/screenshot.gif", "BREAKINGCHANGES_dev.md"]
 edition = "2021"
@@ -14,25 +14,26 @@ edition = "2021"
 readme = "README.md"
 
 [dependencies]
-home = "=0.5.11"
+home = "~0.5,<0.5.11"
-etcetera = "=0.10.0"
+etcetera = "~0.8"
 serde = { version = "~1.0", features = ["derive"] }
-toml = { version = "=0.9.8", features = ["preserve_order"] }
+toml = "0.8"
-which_crate = { version = "~8.0", package = "which" }
+which_crate = { version = "~6.0", package = "which" }
 shellexpand = "~3.1"
 clap = { version = "~4.5", features = ["cargo", "derive"] }
 clap_complete = "~4.5"
 clap_mangen = "~0.2"
 walkdir = "~2.5"
-console = "~0.16"
+console = "~0.15"
 chrono = "~0.4"
 glob = "~0.3"
-strum = { version = "~0.27", features = ["derive"] }
+strum = { version = "~0.26", features = ["derive"] }
-thiserror = "~2.0"
+thiserror = "~1.0"
-tempfile = "~3.23"
+tempfile = "~3.10"
-tokio = { version = "~1.48", features = ["process", "rt-multi-thread"] }
+cfg-if = "~1.0"
+tokio = { version = "~1.47", features = ["process", "rt-multi-thread"] }
 futures = "~0.3"
-regex = "~1.12"
+regex = "~1.10"
 semver = "~1.0"
 shell-words = "~1.1"
 color-eyre = "~0.6"
@@ -49,12 +50,8 @@ indexmap = { version = "2.9.0", features = ["serde"] }
 serde_json = "1.0.145"
 # Temporary transitive dependency pins
 ignore = "=0.4.23"
-globset = "=0.4.16"
+globset = "=0.4.18"
 base64ct = "<1.8.0"
-clap-cargo = "0.15.2"
-
-[patch.crates-io]
-mac-notification-sys = { git = "https://github.com/h4llow3En/mac-notification-sys" }
 
 [package.metadata.generate-rpm]
 assets = [{ source = "target/release/topgrade", dest = "/usr/bin/topgrade" }]
@@ -84,14 +81,14 @@ assets = [
 ]
 
 [target.'cfg(unix)'.dependencies]
-nix = { version = "~0.30", features = ["hostname", "signal", "user"] }
+nix = { version = "~0.29", features = ["hostname", "signal", "user"] }
 rust-ini = "~0.21"
-self_update_crate = { version = "~0.42", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] }
+self_update_crate = { version = "~0.40", default-features = false, optional = true, package = "self_update", features = ["archive-tar", "compression-flate2", "rustls"] }
 
 [target.'cfg(windows)'.dependencies]
 is_elevated = "~0.1"
 parselnk = "~0.1"
-self_update_crate = { version = "~0.42", default-features = false, optional = true, package = "self_update", features = ["archive-zip", "compression-zip-deflate", "rustls"] }
+self_update_crate = { version = "~0.40", default-features = false, optional = true, package = "self_update", features = ["archive-zip", "compression-zip-deflate", "rustls"] }
 windows = { version = "~0.62", features = ["Win32_System_Console"] }
 windows-registry = "~0.6"
 

README.md

@@ -3,10 +3,10 @@
     <img alt="Topgrade" src="doc/topgrade_transparent.png" width="850px">
   </h1>
 
-<a href="https://github.com/topgrade-rs/topgrade/releases"><img alt="GitHub Release" src="https://img.shields.io/github/release/topgrade-rs/topgrade.svg"></a>
+  <a href="https://github.com/topgrade-rs/topgrade/releases"><img alt="GitHub Release" src="https://img.shields.io/github/release/topgrade-rs/topgrade.svg"></a>
-<a href="https://crates.io/crates/topgrade"><img alt="crates.io" src="https://img.shields.io/crates/v/topgrade.svg"></a>
+  <a href="https://crates.io/crates/topgrade"><img alt="crates.io" src="https://img.shields.io/crates/v/topgrade.svg"></a>
-<a href="https://aur.archlinux.org/packages/topgrade"><img alt="AUR" src="https://img.shields.io/aur/version/topgrade.svg"></a>
+  <a href="https://aur.archlinux.org/packages/topgrade"><img alt="AUR" src="https://img.shields.io/aur/version/topgrade.svg"></a>
-<a href="https://formulae.brew.sh/formula/topgrade"><img alt="Homebrew" src="https://img.shields.io/homebrew/v/topgrade.svg"></a>
+  <a href="https://formulae.brew.sh/formula/topgrade"><img alt="Homebrew" src="https://img.shields.io/homebrew/v/topgrade.svg"></a>
 
   <img alt="Demo" src="doc/topgrade_demo.gif">
 </div>
@@ -37,8 +37,6 @@ To remedy this, **Topgrade** detects which tools you use and runs the appropriat
 - Windows ([Winget](https://learn.microsoft.com/en-us/windows/package-manager/winget/)): [
   `winget install --id=topgrade-rs.topgrade  -e`](https://winstall.app/apps/topgrade-rs.topgrade)
 - macOS or Linux ([Homebrew](https://brew.sh/)): [`brew install topgrade`](https://formulae.brew.sh/formula/topgrade)
-- Fedora/RHEL/AlmaLinux/CentOS-Stream ([Copr](https://copr.fedorainfracloud.org/)): [
-  `sudo dnf copr enable lilay/topgrade && sudo dnf install topgrade`](https://copr.fedorainfracloud.org/coprs/lilay/topgrade/)
 
 ### Community-maintained
 
@@ -48,6 +46,8 @@ To remedy this, **Topgrade** detects which tools you use and runs the appropriat
   `scoop bucket add main && scoop install main/topgrade`](https://scoop.sh/#/apps?q=topgrade)
 - macOS ([MacPorts](https://www.macports.org/)): [
   `sudo port install topgrade`](https://ports.macports.org/port/topgrade/)
+- Fedora ([Copr](https://copr.fedorainfracloud.org/)): [
+  `dnf copr enable lilay/topgrade && dnf install topgrade`](https://copr.fedorainfracloud.org/coprs/lilay/topgrade/)
 - NixOS or Nix (nixpkgs): [topgrade](https://search.nixos.org/packages?show=topgrade)
 - Void Linux: [`sudo xbps-install -S topgrade`](https://voidlinux.org/packages/?arch=x86_64&q=topgrade)
 

config.example.toml

@@ -291,20 +291,6 @@
 # (default: false)
 # exclude_encrypted = false
 
-[mise]
-# Upgrades to the latest version available, bumping the version in mise.toml
-# (default: false)
-# bump = false
-
-# Number of jobs to run in parallel
-# (default: 4)
-# jobs = 4
-
-# Run interactively
-# (default: false)
-# interactive = false
-
-
 [npm]
 # Use sudo if the NPM directory isn't owned by the current user
 # use_sudo = true
@@ -356,10 +342,6 @@
 # Specify the runtime to use for containers (default: "docker", allowed values: "docker", "podman")
 # runtime = "podman"
 
-# Run 'docker system prune' to clean up unused containers, networks, and build cache
-# (default: false)
-# system_prune = false
-
 [lensfun]
 # If disabled, Topgrade invokes `lensfun‑update‑data` without root privilege,
 # then the update will be only available to you. Otherwise, `sudo` is required,

locales/app.yml

@@ -694,14 +694,6 @@ _version: 2
   zh_CN: "不是专用的 macOS brew"
   zh_TW: "不是專門的 macOS brew"
   de: "Kein angepasstes Brew für macOS"
-"Homebrew cask support on Linux requires Homebrew 4.5.0 or later (found {version})":
-  en: "Homebrew cask support on Linux requires Homebrew 4.5.0 or later (found %{version})"
-  lt: "Homebrew cask palaikymas Linux sistemoje reikalauja Homebrew 4.5.0 arba naujesnes versijos (rasta %{version})"
-  es: "El soporte de cask de Homebrew en Linux requiere Homebrew 4.5.0 o posterior (encontrado %{version})"
-  fr: "Le support de cask Homebrew sur Linux nécessite Homebrew 4.5.0 ou supérieur (trouvé %{version})"
-  zh_CN: "Linux 上的 Homebrew cask 支持需要 Homebrew 4.5.0 或更高版本（找到 %{version}）"
-  zh_TW: "Linux 上的 Homebrew cask 支援需要 Homebrew 4.5.0 或更高版本（找到 %{version}）"
-  de: "Homebrew-Cask-Unterstützung unter Linux erfordert Homebrew 4.5.0 oder höher (gefunden %{version})"
 "Guix Pull Failed, Skipping":
   en: "Guix Pull Failed, Skipping"
   lt: "Guix traukti nepavyko, praleidžiama"

pyproject.toml

@@ -5,20 +5,13 @@ build-backend = "maturin"
 [project]
 name = "topgrade"
 dynamic = ["version"]
-description = "Upgrade all the things"
-readme = "README.md"
-license = "GPL-3.0-or-later"
 requires-python = ">=3.7"
 classifiers = [
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
     "Programming Language :: Rust",
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
-urls.bugs = "https://github.com/topgrade-rs/topgrade/issues"
-urls.homepage = "https://github.com/topgrade-rs/topgrade"
-
 
 [tool.maturin]
 bindings = "bin"

src/config.rs

@@ -60,7 +60,6 @@ pub struct Containers {
     #[merge(strategy = crate::utils::merge_strategies::vec_prepend_opt)]
     ignored_containers: Option<Vec<String>>,
     runtime: Option<ContainerRuntime>,
-    system_prune: Option<bool>,
 }
 
 #[derive(Deserialize, Default, Debug, Merge)]
@@ -173,15 +172,6 @@ pub struct Chezmoi {
     exclude_encrypted: Option<bool>,
 }
 
-#[derive(Deserialize, Default, Debug, Merge)]
-#[serde(deny_unknown_fields)]
-#[allow(clippy::upper_case_acronyms)]
-pub struct Mise {
-    bump: Option<bool>,
-    interactive: Option<bool>,
-    jobs: Option<u32>,
-}
-
 #[derive(Deserialize, Default, Debug, Merge)]
 #[serde(deny_unknown_fields)]
 #[allow(clippy::upper_case_acronyms)]
@@ -213,10 +203,9 @@ pub struct Brew {
     fetch_head: Option<bool>,
 }
 
-#[derive(Debug, Deserialize, Clone, Copy, Default)]
+#[derive(Debug, Deserialize, Clone, Copy)]
 #[serde(rename_all = "snake_case")]
 pub enum ArchPackageManager {
-    #[default]
     Autodetect,
     Aura,
     GarudaUpdate,
@@ -228,10 +217,9 @@ pub enum ArchPackageManager {
     Yay,
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, Default)]
+#[derive(Clone, Copy, Debug, Deserialize)]
 #[serde(rename_all = "snake_case")]
 pub enum ContainerRuntime {
-    #[default] // defaults to a popular choice
     Docker,
     Podman,
 }
@@ -369,11 +357,10 @@ pub struct Misc {
     show_distribution_summary: Option<bool>,
 }
 
-#[derive(Clone, Copy, Debug, Deserialize, ValueEnum, Default)]
+#[derive(Clone, Copy, Debug, Deserialize, ValueEnum)]
 #[clap(rename_all = "snake_case")]
 #[serde(rename_all = "snake_case")]
 pub enum TmuxSessionMode {
-    #[default]
     AttachIfNotInSession,
     AttachAlways,
 }
@@ -480,9 +467,6 @@ pub struct ConfigFile {
     #[merge(strategy = crate::utils::merge_strategies::inner_merge_opt)]
     chezmoi: Option<Chezmoi>,
 
-    #[merge(strategy = crate::utils::merge_strategies::inner_merge_opt)]
-    mise: Option<Mise>,
-
     #[merge(strategy = crate::utils::merge_strategies::inner_merge_opt)]
     yarn: Option<Yarn>,
 
@@ -729,7 +713,7 @@ impl ConfigFile {
 // TODO: i18n of clap currently not easily possible. Waiting for https://github.com/clap-rs/clap/issues/380
 // Tracking issue for i18n: https://github.com/topgrade-rs/topgrade/issues/859
 #[derive(Parser, Debug)]
-#[command(name = "topgrade", version, styles = clap_cargo::style::CLAP_STYLING)]
+#[command(name = "topgrade", version)]
 pub struct CommandLineArgs {
     /// Edit the configuration file
     #[arg(long = "edit-config")]
@@ -971,16 +955,7 @@ impl Config {
             .containers
             .as_ref()
             .and_then(|containers| containers.runtime)
-            .unwrap_or_default()
+            .unwrap_or(ContainerRuntime::Docker) // defaults to a popular choice
-    }
-
-    /// Whether to run system prune for containers.
-    pub fn containers_system_prune(&self) -> bool {
-        self.config_file
-            .containers
-            .as_ref()
-            .and_then(|containers| containers.system_prune)
-            .unwrap_or(false)
     }
 
     /// Tell whether the specified step should run.
@@ -1052,7 +1027,7 @@ impl Config {
             .misc
             .as_ref()
             .and_then(|misc| misc.tmux_session_mode)
-            .unwrap_or_default()
+            .unwrap_or(TmuxSessionMode::AttachIfNotInSession)
     }
 
     /// Tell whether we should perform cleanup steps.
@@ -1306,7 +1281,7 @@ impl Config {
             .vim
             .as_ref()
             .and_then(|c| c.force_plug_update)
-            .unwrap_or(false)
+            .unwrap_or_default()
     }
 
     /// Whether to send a desktop notification at the beginning of every step
@@ -1379,7 +1354,7 @@ impl Config {
             .linux
             .as_ref()
             .and_then(|s| s.arch_package_manager)
-            .unwrap_or_default()
+            .unwrap_or(ArchPackageManager::Autodetect)
     }
 
     /// Extra yay arguments
@@ -1816,26 +1791,6 @@ impl Config {
             .unwrap_or(false)
     }
 
-    pub fn mise_bump(&self) -> bool {
-        self.config_file
-            .mise
-            .as_ref()
-            .and_then(|mise| mise.bump)
-            .unwrap_or(false)
-    }
-
-    pub fn mise_jobs(&self) -> u32 {
-        self.config_file.mise.as_ref().and_then(|mise| mise.jobs).unwrap_or(4)
-    }
-
-    pub fn mise_interactive(&self) -> bool {
-        self.config_file
-            .mise
-            .as_ref()
-            .and_then(|mise| mise.interactive)
-            .unwrap_or(false)
-    }
-
     pub fn vscode_profile(&self) -> Option<&str> {
         let vscode_cfg = self.config_file.vscode.as_ref()?;
         let profile = vscode_cfg.profile.as_ref()?;
@@ -1924,24 +1879,4 @@ mod test {
         config.opt = CommandLineArgs::parse_from(["topgrade", "--remote-host-limit", "other_hostname"]);
         assert!(!config.should_execute_remote(Ok("hostname".to_string()), "user@remote_hostname"));
     }
-
-    /// Ensure that custom commands are stored in insertion order.
-    #[test]
-    fn test_custom_commands_order() {
-        let toml_str = r#"
-[commands]
-z = "cmd_z"
-y = "cmd_y"
-x = "cmd_x"
-"#;
-        let order: Vec<_> = toml::from_str::<ConfigFile>(toml_str)
-            .expect("toml parse error")
-            .commands
-            .expect("commands field missing")
-            .keys()
-            .cloned()
-            .collect();
-
-        assert_eq!(order, vec!["z", "y", "x"]);
-    }
 }

src/main.rs

@@ -12,6 +12,7 @@ use clap::{crate_version, Parser};
 use color_eyre::eyre::Context;
 use color_eyre::eyre::Result;
 use console::Key;
+use etcetera::base_strategy::BaseStrategy;
 #[cfg(windows)]
 use etcetera::base_strategy::Windows;
 #[cfg(unix)]
@@ -208,19 +209,7 @@ fn run() -> Result<()> {
     }
 
     for step in step::default_steps() {
-        match step.run(&mut runner, &ctx) {
+        step.run(&mut runner, &ctx)?
-            Ok(()) => (),
-            Err(error)
-                if error
-                    .downcast_ref::<io::Error>()
-                    .is_some_and(|e| e.kind() == io::ErrorKind::Interrupted) =>
-            {
-                println!();
-                debug!("Interrupted (possibly with 'q' during retry prompt). Printing summary.");
-                break;
-            }
-            Err(error) => return Err(error),
-        }
     }
 
     let mut failed = false;

src/runner.rs

@@ -1,15 +1,14 @@
-use color_eyre::eyre::{Result, WrapErr};
+use color_eyre::eyre::Result;
 use rust_i18n::t;
 use std::borrow::Cow;
 use std::fmt::Debug;
-use std::io;
 use tracing::debug;
 
 use crate::ctrlc;
 use crate::error::{DryRun, MissingSudo, SkipStep};
 use crate::execution_context::ExecutionContext;
 use crate::step::Step;
-use crate::terminal::{print_error, print_warning, should_retry, ShouldRetry};
+use crate::terminal::{print_error, print_warning, should_retry};
 
 pub enum StepResult {
     Success,
@@ -99,28 +98,21 @@ impl<'a> Runner<'a> {
                     let should_ask = interrupted || !(self.ctx.config().no_retry() || ignore_failure);
                     let should_retry = if should_ask {
                         print_error(&key, format!("{e:?}"));
-                        should_retry(key.as_ref())?
+                        should_retry(interrupted, key.as_ref())?
                     } else {
-                        ShouldRetry::No
+                        false
                     };
 
-                    match should_retry {
+                    if !should_retry {
-                        ShouldRetry::No | ShouldRetry::Quit => {
+                        self.push_result(
-                            self.push_result(
+                            key,
-                                key,
+                            if ignore_failure {
-                                if ignore_failure {
+                                StepResult::Ignored
-                                    StepResult::Ignored
+                            } else {
-                                } else {
+                                StepResult::Failure
-                                    StepResult::Failure
+                            },
-                                },
+                        );
-                            );
+                        break;
-                            if let ShouldRetry::Quit = should_retry {
-                                return Err(io::Error::from(io::ErrorKind::Interrupted))
-                                    .context("Quit from user input");
-                            }
-                            break;
-                        }
-                        ShouldRetry::Yes => (),
                     }
                 }
             }

src/step.rs

@@ -225,7 +225,7 @@ impl Step {
             Bin => runner.execute(*self, "bin", || generic::bin_update(ctx))?,
             Bob => runner.execute(*self, "Bob", || generic::run_bob(ctx))?,
             BrewCask => {
-                #[cfg(any(target_os = "linux", target_os = "macos"))]
+                #[cfg(target_os = "macos")]
                 runner.execute(*self, "Brew Cask", || unix::run_brew_cask(ctx, unix::BrewVariant::Path))?;
                 #[cfg(target_os = "macos")]
                 runner.execute(*self, "Brew Cask (Intel)", || {
@@ -750,7 +750,6 @@ pub(crate) fn default_steps() -> Vec<Step> {
         Restarts,
         Flatpak,
         BrewFormula,
-        BrewCask,
         Lure,
         Waydroid,
         AutoCpufreq,

src/steps/containers.rs

@@ -11,7 +11,7 @@ use tracing::{debug, error, warn};
 use wildmatch::WildMatch;
 
 use crate::command::CommandExt;
-use crate::error::{SkipStep, TopgradeError};
+use crate::error::{self, SkipStep, TopgradeError};
 use crate::terminal::print_separator;
 use crate::{execution_context::ExecutionContext, utils::require};
 use rust_i18n::t;
@@ -185,6 +185,7 @@ pub fn run_containers(ctx: &ExecutionContext) -> Result<()> {
         ));
     }
 
+    let mut success = true;
     let containers =
         list_containers(&crt, ctx.config().containers_ignored_tags()).context("Failed to list Docker containers")?;
     debug!("Containers to inspect: {:?}", containers);
@@ -219,21 +220,22 @@ pub fn run_containers(ctx: &ExecutionContext) -> Result<()> {
                 continue;
             }
 
-            return Err(e);
+            success = false;
         }
     }
 
-    if ctx.config().containers_system_prune() {
+    if ctx.config().cleanup() {
-        // Run system prune to clean up unused containers, networks, and build cache
-        ctx.execute(&crt)
-            .args(["system", "prune", "--force"])
-            .status_checked()?
-    // Only run `image prune` if we don't run `system prune`
-    } else if ctx.config().cleanup() {
         // Remove dangling images
         debug!("Removing dangling images");
-        ctx.execute(&crt).args(["image", "prune", "-f"]).status_checked()?
+        if let Err(e) = ctx.execute(&crt).args(["image", "prune", "-f"]).status_checked() {
+            error!("Removing dangling images failed: {}", e);
+            success = false;
+        }
     }
 
-    Ok(())
+    if success {
+        Ok(())
+    } else {
+        Err(eyre!(error::StepFailed))
+    }
 }

src/steps/generic.rs

@@ -282,17 +282,6 @@ pub fn run_elan(ctx: &ExecutionContext) -> Result<()> {
 
     print_separator("elan");
 
-    let version_output = ctx.execute(&elan).arg("--version").output_checked_utf8()?;
-    let version_string = version_output.stdout.split_whitespace().nth(1).ok_or_else(|| {
-        eyre!(output_changed_message!(
-            "elan --version",
-            "Expected version after 'elan '"
-        ))
-    })?;
-    let version = Version::parse(version_string)
-        .wrap_err_with(|| output_changed_message!("elan --version", "Invalid version"))?;
-    debug!("Detected elan version as: {}", version);
-
     let disabled_error_msg = "self-update is disabled";
     let executor_output = ctx.execute(&elan).args(["self", "update"]).output()?;
     match executor_output {
@@ -321,12 +310,7 @@ pub fn run_elan(ctx: &ExecutionContext) -> Result<()> {
         ExecutorOutput::Dry => { /* nothing needed because in a dry run */ }
     }
 
-    // In elan 4.0.0, `elan update` was removed, as toolchains are now updated automatically
+    ctx.execute(&elan).arg("update").status_checked()
-    if version < Version::new(4, 0, 0) {
-        ctx.execute(&elan).arg("update").status_checked()?;
-    }
-
-    Ok(())
 }
 
 pub fn run_juliaup(ctx: &ExecutionContext) -> Result<()> {
@@ -889,11 +873,12 @@ pub fn run_tldr(ctx: &ExecutionContext) -> Result<()> {
 }
 
 pub fn run_tlmgr_update(ctx: &ExecutionContext) -> Result<()> {
-    if cfg!(any(target_os = "linux", target_os = "android")) && !ctx.config().enable_tlmgr_linux() {
+    cfg_if::cfg_if! {
-        return Err(SkipStep(String::from(
+        if #[cfg(any(target_os = "linux", target_os = "android"))] {
-            "tlmgr must be explicitly enabled in the configuration to run in Android/Linux",
+            if !ctx.config().enable_tlmgr_linux() {
-        ))
+                return Err(SkipStep(String::from("tlmgr must be explicitly enabled in the configuration to run in Android/Linux")).into());
-        .into());
+            }
+        }
     }
 
     let tlmgr = require("tlmgr")?;
@@ -998,19 +983,23 @@ pub fn run_composer_update(ctx: &ExecutionContext) -> Result<()> {
     print_separator(t!("Composer"));
 
     if ctx.config().composer_self_update() {
-        if cfg!(unix) {
+        cfg_if::cfg_if! {
-            // If self-update fails without sudo then there's probably an update
+            if #[cfg(unix)] {
-            let has_update = match ctx.execute(&composer).arg("self-update").output()? {
+                // If self-update fails without sudo then there's probably an update
-                ExecutorOutput::Wet(output) => !output.status.success(),
+                let has_update = match ctx.execute(&composer).arg("self-update").output()? {
-                _ => false,
+                    ExecutorOutput::Wet(output) => !output.status.success(),
-            };
+                    _ => false
+                };
 
-            if has_update {
+                if has_update {
-                let sudo = ctx.require_sudo()?;
+                    let sudo = ctx.require_sudo()?;
-                sudo.execute(ctx, &composer)?.arg("self-update").status_checked()?;
+                    sudo.execute(ctx, &composer)?
+                       .arg("self-update")
+                       .status_checked()?;
+                }
+            } else {
+                ctx.execute(&composer).arg("self-update").status_checked()?;
             }
-        } else {
-            ctx.execute(&composer).arg("self-update").status_checked()?;
         }
     }
 

src/steps/os/linux.rs

@@ -78,8 +78,6 @@ impl Distribution {
             Some("neon") => Distribution::KDENeon,
             Some("openmandriva") => Distribution::OpenMandriva,
             Some("pclinuxos") => Distribution::PCLinuxOS,
-            Some(id) if id.starts_with("origami") => Distribution::FedoraImmutable,
-
             _ => {
                 if let Some(name) = name {
                     if name.contains("Vanilla") {
@@ -1343,11 +1341,4 @@ mod tests {
     fn test_cachyos() {
         test_template(include_str!("os_release/cachyos"), Distribution::Arch);
     }
-
-    #[test]
-    fn test_origami() {
-        test_template(include_str!("os_release/origami"), Distribution::FedoraImmutable);
-        test_template(include_str!("os_release/origami-nvidia"), Distribution::FedoraImmutable);
-        test_template(include_str!("os_release/origami-test"), Distribution::FedoraImmutable);
-    }
 }

src/steps/os/os_release/origami

@@ -1,23 +0,0 @@
-NAME="Origami Linux"
-VERSION="43.20251117.0 (COSMIC Atomic)"
-RELEASE_TYPE="stable"
-ID="origami-linux"
-VERSION_ID="43"
-VERSION_CODENAME=""
-PRETTY_NAME="Origami 折り紙"
-ANSI_COLOR="0;38;2;60;110;180"
-LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:fedoraproject:fedora:43"
-DEFAULT_HOSTNAME="origami"
-HOME_URL="https://origami.wf/"
-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f43/"
-SUPPORT_URL="https://ask.fedoraproject.org/"
-BUG_REPORT_URL="https://gitlab.com/groups/origami-linux/-/issues"
-REDHAT_BUGZILLA_PRODUCT="Fedora"
-REDHAT_BUGZILLA_PRODUCT_VERSION="43"
-REDHAT_SUPPORT_PRODUCT="Fedora"
-REDHAT_SUPPORT_PRODUCT_VERSION="43"
-SUPPORT_END="2026-12-02"
-VARIANT="COSMIC Atomic"
-VARIANT_ID="cosmic-atomic"
-OSTREE_VERSION="43.20251117.0"

src/steps/os/os_release/origami-nvidia

@@ -1,23 +0,0 @@
-NAME="Origami Linux Nvidia"
-VERSION="43.20251117.0 (COSMIC Atomic)"
-RELEASE_TYPE="stable"
-ID="origami-linux-nvidia"
-VERSION_ID="43"
-VERSION_CODENAME=""
-PRETTY_NAME="Origami 折り紙"
-ANSI_COLOR="0;38;2;60;110;180"
-LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:fedoraproject:fedora:43"
-DEFAULT_HOSTNAME="origami"
-HOME_URL="https://origami.wf/"
-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f43/"
-SUPPORT_URL="https://ask.fedoraproject.org/"
-BUG_REPORT_URL="https://gitlab.com/groups/origami-linux/-/issues"
-REDHAT_BUGZILLA_PRODUCT="Fedora"
-REDHAT_BUGZILLA_PRODUCT_VERSION="43"
-REDHAT_SUPPORT_PRODUCT="Fedora"
-REDHAT_SUPPORT_PRODUCT_VERSION="43"
-SUPPORT_END="2026-12-02"
-VARIANT="COSMIC Atomic"
-VARIANT_ID="cosmic-atomic"
-OSTREE_VERSION="43.20251117.0"

src/steps/os/os_release/origami-test

@@ -1,23 +0,0 @@
-NAME="Origami Linux Test"
-VERSION="43.20251117.0 (COSMIC Atomic)"
-RELEASE_TYPE="stable"
-ID="origami-linux-test"
-VERSION_ID="43"
-VERSION_CODENAME=""
-PRETTY_NAME="Origami 折り紙"
-ANSI_COLOR="0;38;2;60;110;180"
-LOGO="fedora-logo-icon"
-CPE_NAME="cpe:/o:fedoraproject:fedora:43"
-DEFAULT_HOSTNAME="origami"
-HOME_URL="https://origami.wf/"
-DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/fedora/f43/"
-SUPPORT_URL="https://ask.fedoraproject.org/"
-BUG_REPORT_URL="https://gitlab.com/groups/origami-linux/-/issues"
-REDHAT_BUGZILLA_PRODUCT="Fedora"
-REDHAT_BUGZILLA_PRODUCT_VERSION="43"
-REDHAT_SUPPORT_PRODUCT="Fedora"
-REDHAT_SUPPORT_PRODUCT_VERSION="43"
-SUPPORT_END="2026-12-02"
-VARIANT="COSMIC Atomic"
-VARIANT_ID="cosmic-atomic"
-OSTREE_VERSION="43.20251117.0"

src/steps/os/unix.rs

@@ -81,6 +81,7 @@ impl BrewVariant {
     /// Execute an "internal" brew command, i.e. one that should always be run
     /// even when dry-running. Basically just a wrapper around [`Command::new`]
     /// that uses `arch` to run using the correct architecture if needed.
+    #[cfg(target_os = "macos")]
     fn execute_internal(self) -> Command {
         match self {
             BrewVariant::MacIntel if cfg!(target_arch = "aarch64") => {
@@ -364,48 +365,12 @@ pub fn run_brew_formula(ctx: &ExecutionContext, variant: BrewVariant) -> Result<
     Ok(())
 }
 
-#[cfg(any(target_os = "linux", target_os = "macos"))]
+#[cfg(target_os = "macos")]
 pub fn run_brew_cask(ctx: &ExecutionContext, variant: BrewVariant) -> Result<()> {
     let binary_name = require(variant.binary_name())?;
-
-    #[cfg(target_os = "macos")]
     if variant.is_path() && !BrewVariant::is_macos_custom(binary_name) {
         return Err(SkipStep(t!("Not a custom brew for macOS").to_string()).into());
     }
-
-    #[cfg(target_os = "linux")]
-    {
-        // Homebrew cask support was added in version 4.5.0
-        let version_output = Command::new(&binary_name).arg("--version").output_checked_utf8()?;
-
-        let version_line = version_output
-            .stdout
-            .lines()
-            .next()
-            .ok_or_else(|| eyre!(output_changed_message!("brew --version", "no output lines")))?;
-
-        let version_str = version_line.split_whitespace().nth(1).ok_or_else(|| {
-            eyre!(output_changed_message!(
-                "brew --version",
-                "Expected version after 'Homebrew'"
-            ))
-        })?;
-
-        let version = Version::parse(version_str)
-            .wrap_err_with(|| output_changed_message!("brew --version", "Invalid version"))?;
-
-        if version < Version::new(4, 5, 0) {
-            return Err(SkipStep(
-                t!(
-                    "Homebrew cask support on Linux requires Homebrew 4.5.0 or later (found {version})",
-                    version = version
-                )
-                .to_string(),
-            )
-            .into());
-        }
-    }
-
     print_separator(format!("{} - Cask", variant.step_title()));
 
     let cask_upgrade_exists = variant
@@ -859,23 +824,7 @@ pub fn run_mise(ctx: &ExecutionContext) -> Result<()> {
         }
     }
 
-    let mut cmd = ctx.execute(&mise);
+    ctx.execute(&mise).arg("upgrade").status_checked()
-
-    cmd.arg("upgrade");
-
-    if ctx.config().mise_interactive() {
-        cmd.arg("--interactive");
-    }
-
-    if ctx.config().mise_bump() {
-        cmd.arg("--bump");
-    }
-
-    if ctx.config().mise_jobs() != 4 {
-        cmd.args(["--jobs", &ctx.config().mise_jobs().to_string()]);
-    }
-
-    cmd.status_checked()
 }
 
 pub fn run_home_manager(ctx: &ExecutionContext) -> Result<()> {

src/terminal.rs

@@ -201,11 +201,10 @@ impl Terminal {
             }
         }
     }
-
     #[allow(unused_variables)]
-    fn should_retry(&mut self, step_name: &str) -> eyre::Result<ShouldRetry> {
+    fn should_retry(&mut self, interrupted: bool, step_name: &str) -> eyre::Result<bool> {
         if self.width.is_none() {
-            return Ok(ShouldRetry::No);
+            return Ok(false);
         }
 
         if self.set_title {
@@ -224,7 +223,7 @@ impl Terminal {
 
         let answer = loop {
             match self.term.read_key() {
-                Ok(Key::Char('y' | 'Y')) => break Ok(ShouldRetry::Yes),
+                Ok(Key::Char('y' | 'Y')) => break Ok(true),
                 Ok(Key::Char('s' | 'S')) => {
                     println!(
                         "\n\n{}\n",
@@ -233,16 +232,16 @@ impl Terminal {
                     if let Err(err) = run_shell().context("Failed to run shell") {
                         self.term.write_fmt(format_args!("{err:?}\n{prompt_inner}")).ok();
                     } else {
-                        break Ok(ShouldRetry::Yes);
+                        break Ok(true);
                     }
                 }
-                Ok(Key::Char('n' | 'N') | Key::Enter) => break Ok(ShouldRetry::No),
+                Ok(Key::Char('n' | 'N') | Key::Enter) => break Ok(false),
                 Err(e) => {
                     error!("Error reading from terminal: {}", e);
-                    break Ok(ShouldRetry::No);
+                    break Ok(false);
                 }
                 Ok(Key::Char('q' | 'Q')) => {
-                    break Ok(ShouldRetry::Quit);
+                    return Err(io::Error::from(io::ErrorKind::Interrupted)).context("Quit from user input")
                 }
                 _ => (),
             }
@@ -258,21 +257,14 @@ impl Terminal {
     }
 }
 
-#[derive(Clone, Copy)]
-pub enum ShouldRetry {
-    Yes,
-    No,
-    Quit,
-}
-
 impl Default for Terminal {
     fn default() -> Self {
         Self::new()
     }
 }
 
-pub fn should_retry(step_name: &str) -> eyre::Result<ShouldRetry> {
+pub fn should_retry(interrupted: bool, step_name: &str) -> eyre::Result<bool> {
-    TERMINAL.lock().unwrap().should_retry(step_name)
+    TERMINAL.lock().unwrap().should_retry(interrupted, step_name)
 }
 
 pub fn print_separator<P: AsRef<str>>(message: P) {