summaryrefslogtreecommitdiffhomepage
path: root/mullvad_cli/src
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-07-13 11:12:08 +0200
committerErik Larkö <erik@mullvad.net>2017-07-14 13:10:43 +0200
commit08fe7ad5cffe138741e9e94b5c9187169d8b36f2 (patch)
treea9a12e43a1160ca35af4a5a0aee23a8fa2bce930 /mullvad_cli/src
parentcd4e983ca55135dbd7a92b032d739c84148675c7 (diff)
downloadmullvadvpn-08fe7ad5cffe138741e9e94b5c9187169d8b36f2.tar.xz
mullvadvpn-08fe7ad5cffe138741e9e94b5c9187169d8b36f2.zip
Write the RPC server address to the tempdir instead of the working directory
Diffstat (limited to 'mullvad_cli/src')
-rw-r--r--mullvad_cli/src/rpc.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/mullvad_cli/src/rpc.rs b/mullvad_cli/src/rpc.rs
index 73c0c64dc1..7397e822c4 100644
--- a/mullvad_cli/src/rpc.rs
+++ b/mullvad_cli/src/rpc.rs
@@ -25,12 +25,12 @@ pub fn call_internal<T, O>(method: &str, args: &T) -> Result<O>
}
fn read_rpc_address() -> Result<String> {
- for path in &["./.mullvad_rpc_address", "../.mullvad_rpc_address"] {
- debug!("Trying to read RPC address at {}", path);
- let mut address = String::new();
- if let Ok(_) = File::open(path).and_then(|mut file| file.read_to_string(&mut address)) {
- return Ok(address);
- }
+ let path = ::std::env::temp_dir().join(".mullvad_rpc_address");
+
+ debug!("Trying to read RPC address at {}", path.to_string_lossy());
+ let mut address = String::new();
+ if let Ok(_) = File::open(path).and_then(|mut file| file.read_to_string(&mut address)) {
+ return Ok(address);
}
bail!("Unable to read RPC address");
}