Merge branch 'remove-shutdown-from-cli'

3 files changed, 3 insertions, 26 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056281d898..b33994a45e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -65,6 +65,9 @@ Line wrap the file at 100 chars.                                              Th
 - Move daemon logs to `/var/log/mullvad-daemon/`, settings to `/etc/mullvad-daemon/` and cache to
   `/var/root/Library/Caches/mullvad-daemon/`.
 
+### Removed
+- Remove the `shutdown` command from the CLI.
+
 ### Fixed
 - Fix bug in account input field that advanced the cursor to the end regardless its prior position.
 - Redact all 16 digit numbers from problem report logs. Extra safety against accidentally sending
diff --git a/mullvad-cli/src/cmds/mod.rs b/mullvad-cli/src/cmds/mod.rs
index 3b6e26a2a8..4e54aadbca 100644
--- a/mullvad-cli/src/cmds/mod.rs
+++ b/mullvad-cli/src/cmds/mod.rs
@@ -16,9 +16,6 @@ pub use self::disconnect::Disconnect;
 mod relay;
 pub use self::relay::Relay;
 
-mod shutdown;
-pub use self::shutdown::Shutdown;
-
 mod lan;
 pub use self::lan::Lan;
 
@@ -35,7 +32,6 @@ pub fn get_commands() -> HashMap<&'static str, Box<Command>> {
         Box::new(Status),
         Box::new(Connect),
         Box::new(Disconnect),
-        Box::new(Shutdown),
         Box::new(Relay),
         Box::new(Lan),
         Box::new(Tunnel),
diff --git a/mullvad-cli/src/cmds/shutdown.rs b/mullvad-cli/src/cmds/shutdown.rs
deleted file mode 100644
index f56ba0a972..0000000000
--- a/mullvad-cli/src/cmds/shutdown.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-use clap;
-use {Command, Result};
-
-use mullvad_ipc_client::DaemonRpcClient;
-
-pub struct Shutdown;
-
-impl Command for Shutdown {
-    fn name(&self) -> &'static str {
-        "shutdown"
-    }
-
-    fn clap_subcommand(&self) -> clap::App<'static, 'static> {
-        clap::SubCommand::with_name(self.name()).about("Makes the backend daemon quit")
-    }
-
-    fn run(&self, _matches: &clap::ArgMatches) -> Result<()> {
-        let mut rpc = DaemonRpcClient::new()?;
-        rpc.shutdown()?;
-        Ok(())
-    }
-}