aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-08-07 11:25:22 +0100
committerbors[bot] <26634292+bors[bot]@users.noreply.github.com>2019-08-07 11:25:22 +0100
commit9ea4ae680a2d3ce2da38cd7fc6c039e5d7d03171 (patch)
tree67b588539365a6f5a92e8a33a49d9fc13381b083
parent7e12422fa2c8ba7b3df63b4e4297464a0071a359 (diff)
parenta2966944a80c7e017865e9705628e41b5bb4cd14 (diff)
Merge #1659
1659: install server first r=matklad a=matklad Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r--crates/ra_tools/src/main.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_tools/src/main.rs b/crates/ra_tools/src/main.rs
index 4fcb2adeb..54d96e446 100644
--- a/crates/ra_tools/src/main.rs
+++ b/crates/ra_tools/src/main.rs
@@ -63,12 +63,12 @@ fn install(opts: InstallOpt) -> Result<()> {
63 if cfg!(target_os = "macos") { 63 if cfg!(target_os = "macos") {
64 fix_path_for_mac()? 64 fix_path_for_mac()?
65 } 65 }
66 if let Some(client) = opts.client {
67 install_client(client)?;
68 }
69 if let Some(server) = opts.server { 66 if let Some(server) = opts.server {
70 install_server(server)?; 67 install_server(server)?;
71 } 68 }
69 if let Some(client) = opts.client {
70 install_client(client)?;
71 }
72 Ok(()) 72 Ok(())
73} 73}
74 74