diff options
| author | Andrej Mihajlov <and@mullvad.net> | 2018-04-04 16:12:15 +0200 |
|---|---|---|
| committer | Andrej Mihajlov <and@mullvad.net> | 2018-04-04 16:51:29 +0200 |
| commit | 8cf30bc78b534e6ffba8d54501201499f9ec826d (patch) | |
| tree | b05af36c960a6ed507691d2ea0b71fa16bd65a79 | |
| parent | d1c55f06e19c621c48be3e6288c20b0cc47095f9 (diff) | |
| download | mullvadvpn-8cf30bc78b534e6ffba8d54501201499f9ec826d.tar.xz mullvadvpn-8cf30bc78b534e6ffba8d54501201499f9ec826d.zip | |
Switch to global windows temp directory on windows
| -rw-r--r-- | mullvad-cli/src/rpc.rs | 5 | ||||
| -rw-r--r-- | mullvad-daemon/src/rpc_address_file.rs | 5 | ||||
| -rw-r--r-- | mullvad-daemon/tests/common/mod.rs | 5 |
3 files changed, 12 insertions, 3 deletions
diff --git a/mullvad-cli/src/rpc.rs b/mullvad-cli/src/rpc.rs index b6e4a6c4b0..a355175c55 100644 --- a/mullvad-cli/src/rpc.rs +++ b/mullvad-cli/src/rpc.rs @@ -40,7 +40,10 @@ lazy_static! { #[cfg(not(unix))] lazy_static! { /// The path to the file where we read the RPC address - static ref RPC_ADDRESS_FILE_PATH: PathBuf = ::std::env::temp_dir().join(".mullvad_rpc_address"); + static ref RPC_ADDRESS_FILE_PATH: PathBuf = { + let windows_directory = ::std::env::var_os("WINDIR").unwrap(); + PathBuf::from(windows_directory).join("Temp").join(".mullvad_rpc_address") + }; } fn read_rpc_address() -> Result<(String, String)> { diff --git a/mullvad-daemon/src/rpc_address_file.rs b/mullvad-daemon/src/rpc_address_file.rs index f40b9073c1..fc3bc1cf1e 100644 --- a/mullvad-daemon/src/rpc_address_file.rs +++ b/mullvad-daemon/src/rpc_address_file.rs @@ -24,7 +24,10 @@ lazy_static! { #[cfg(not(unix))] lazy_static! { /// The path to the file where we write the RPC connection info - static ref RPC_ADDRESS_FILE_PATH: PathBuf = ::std::env::temp_dir().join(".mullvad_rpc_address"); + static ref RPC_ADDRESS_FILE_PATH: PathBuf = { + let windows_directory = ::std::env::var_os("WINDIR").unwrap(); + PathBuf::from(windows_directory).join("Temp").join(".mullvad_rpc_address") + }; } diff --git a/mullvad-daemon/tests/common/mod.rs b/mullvad-daemon/tests/common/mod.rs index 8259c63795..fc6d5283cd 100644 --- a/mullvad-daemon/tests/common/mod.rs +++ b/mullvad-daemon/tests/common/mod.rs @@ -35,7 +35,10 @@ mod platform_specific { pub static DAEMON_EXECUTABLE_PATH: &str = r"..\target\debug\mullvad-daemon.exe"; pub fn rpc_file_path() -> PathBuf { - ::std::env::temp_dir().join(".mullvad_rpc_address") + let windows_directory = ::std::env::var_os("WINDIR").unwrap(); + PathBuf::from(windows_directory) + .join("Temp") + .join(".mullvad_rpc_address") } } |