From 3e438be3020d953bb29615a9f1d05b5174107f09 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Sun, 19 Jul 2020 13:54:12 +0200
Subject: [PATCH] Add an option to disable setup checks

The path check should only take a few milliseconds to run, but checking
whether yabridge-host.exe runs correctly could take over a second when
wineserver isn't already running in the background.
---
 CHANGELOG.md                     | 10 ++++++++++
 tools/yabridgectl/src/actions.rs |  5 +++++
 tools/yabridgectl/src/main.rs    |  7 +++++++
 3 files changed, 22 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 941f1f04..dcc0c17f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic
 Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+### yabridgectl
+
+- Added a `--no-verify` option to `yabridgectl sync` to skip the
+  post-installation setup checks. This option will skip both the login shell
+  search path check when using the copy-based installation method as well as the
+  new check for whether or not yabridge will be able to run with the currently
+  installed version of Wine.
+
 ## [1.3.0] - 2020-07-17
 
 ### Added
diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs
index 03bb7c92..027e8c5f 100644
--- a/tools/yabridgectl/src/actions.rs
+++ b/tools/yabridgectl/src/actions.rs
@@ -144,6 +144,7 @@ pub fn set_settings(config: &mut Config, options: &SetOptions) -> Result<()> {
 
 /// Options passed to `yabridgectl sync`, see `main()` for the definitions of these options.
 pub struct SyncOptions {
+    pub no_verify: bool,
     pub prune: bool,
     pub verbose: bool,
 }
@@ -237,6 +238,10 @@ pub fn do_sync(config: &Config, options: &SyncOptions) -> Result<()> {
         num_skipped_files
     );
 
+    if options.no_verify {
+        return Ok(());
+    }
+
     if config.method == InstallationMethod::Copy {
         if let Err(shell_name) = verify_path_setup() {
             println!(
diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs
index 47db6c09..f4b1449a 100644
--- a/tools/yabridgectl/src/main.rs
+++ b/tools/yabridgectl/src/main.rs
@@ -100,6 +100,12 @@ fn main() -> Result<()> {
         .subcommand(
             App::new("sync")
                 .about("Set up or update yabridge for all plugins")
+                .arg(
+                    Arg::with_name("no-verify")
+                        .short('n')
+                        .long("no-verify")
+                        .about("Skip post-installation setup checks"),
+                )
                 .arg(
                     Arg::with_name("prune")
                         .short('p')
@@ -136,6 +142,7 @@ fn main() -> Result<()> {
         ("sync", Some(options)) => actions::do_sync(
             &config,
             &actions::SyncOptions {
+                no_verify: options.is_present("no-verify"),
                 prune: options.is_present("prune"),
                 verbose: options.is_present("verbose"),
             },