diff options
| author | David Lönnhager <david.l@mullvad.net> | 2023-11-17 11:10:16 +0100 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2023-11-17 11:10:16 +0100 |
| commit | d798fd5872e311fffeccd9930a45fdb2ed7eb2ea (patch) | |
| tree | e01cb6d76e8b3ee10c530bb85767b533fa1bebc3 /mullvad-cli/src/main.rs | |
| parent | 0a82036e2b49dbd42819d36860b00289b3219a6b (diff) | |
| parent | b83735c6a569baecd2272d0a78721fe7998a47ce (diff) | |
| download | mullvadvpn-d798fd5872e311fffeccd9930a45fdb2ed7eb2ea.tar.xz mullvadvpn-d798fd5872e311fffeccd9930a45fdb2ed7eb2ea.zip | |
Merge branch 'add-settings-patching' into main
Diffstat (limited to 'mullvad-cli/src/main.rs')
| -rw-r--r-- | mullvad-cli/src/main.rs | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/mullvad-cli/src/main.rs b/mullvad-cli/src/main.rs index 7a09a4eebd..d1c518119c 100644 --- a/mullvad-cli/src/main.rs +++ b/mullvad-cli/src/main.rs @@ -133,6 +133,12 @@ enum Cli { /// Manage custom lists #[clap(subcommand)] CustomList(custom_list::CustomList), + + /// Apply a JSON patch + ImportSettings { + /// File to read from. If this is "-", read from standard input + file: String, + }, } #[tokio::main] @@ -160,6 +166,7 @@ async fn main() -> Result<()> { Cli::SplitTunnel(cmd) => cmd.handle().await, Cli::Status { cmd, args } => status::handle(cmd, args).await, Cli::CustomList(cmd) => cmd.handle().await, + Cli::ImportSettings { file } => import_settings::handle(file).await, #[cfg(all(unix, not(target_os = "android")))] Cli::ShellCompletions { shell, dir } => { |