grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use platform module as intended

Browse Source
This commit is contained in:
Nicolas Ochem 2017-12-27 06:17:39 -08:00
parent a8001ab453
commit a4a9c53b13
1 changed files with 28 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
util/dir/src/lib.rs
View File

@ -28,6 +28,8 @@ use bigint::hash::{H64, H256};
use journaldb::Algorithm; use journaldb::Algorithm;
use helpers::{replace_home, replace_home_and_local}; use helpers::{replace_home, replace_home_and_local};
use app_dirs::{AppInfo, get_app_root, AppDataType}; use app_dirs::{AppInfo, get_app_root, AppDataType};
// re-export platform-specific functions
use platform::*;
#[cfg(target_os = "macos")] const AUTHOR: &'static str = "Parity"; #[cfg(target_os = "macos")] const AUTHOR: &'static str = "Parity";
#[cfg(target_os = "macos")] const PRODUCT: &'static str = "io.parity.ethereum"; #[cfg(target_os = "macos")] const PRODUCT: &'static str = "io.parity.ethereum";
@ -278,7 +280,7 @@ fn home() -> PathBuf {
/// Geth path /// Geth path
pub fn geth(testnet: bool) -> PathBuf { pub fn geth(testnet: bool) -> PathBuf {
let mut base = platform::geth_base(); let mut base = geth_base();
if testnet { if testnet {
base.push("testnet"); base.push("testnet");
} }
@ -288,14 +290,14 @@ pub fn geth(testnet: bool) -> PathBuf {
/// Parity path for specific chain /// Parity path for specific chain
pub fn parity(chain: &str) -> PathBuf { pub fn parity(chain: &str) -> PathBuf {
let mut base = platform::parity_base(); let mut base = parity_base();
base.push(chain); base.push(chain);
base base
} }
#[cfg(target_os = "macos")]
mod platform { mod platform {
use std::path::PathBuf; use std::path::PathBuf;
#[cfg(target_os = "macos")]
pub fn parity_base() -> PathBuf { pub fn parity_base() -> PathBuf {
let mut home = super::home(); let mut home = super::home();
home.push("Library"); home.push("Library");
@ -305,7 +307,17 @@ mod platform {
home home
} }
pub fn geth_base() -> PathBuf {
let mut home = super::home();
home.push("Library");
home.push("Ethereum");
home
}
}
#[cfg(windows)] #[cfg(windows)]
mod platform {
use std::path::PathBuf;
pub fn parity_base() -> PathBuf { pub fn parity_base() -> PathBuf {
let mut home = super::home(); let mut home = super::home();
home.push("AppData"); home.push("AppData");
@ -316,7 +328,18 @@ mod platform {
home home
} }
pub fn geth_base() -> PathBuf {
let mut home = super::home();
home.push("AppData");
home.push("Roaming");
home.push("Ethereum");
home
}
}
#[cfg(not(any(target_os = "macos", windows)))] #[cfg(not(any(target_os = "macos", windows)))]
mod platform {
use std::path::PathBuf;
pub fn parity_base() -> PathBuf { pub fn parity_base() -> PathBuf {
let mut home = super::home(); let mut home = super::home();
home.push(".local"); home.push(".local");
@ -326,24 +349,6 @@ mod platform {
home home
} }
#[cfg(target_os = "macos")]
pub fn geth_base() -> PathBuf {
let mut home = super::home();
home.push("Library");
home.push("Ethereum");
home
}
#[cfg(windows)]
pub fn geth_base() -> PathBuf {
let mut home = super::home();
home.push("AppData");
home.push("Roaming");
home.push("Ethereum");
home
}
#[cfg(not(any(target_os = "macos", windows)))]
pub fn geth_base() -> PathBuf { pub fn geth_base() -> PathBuf {
let mut home = super::home(); let mut home = super::home();
home.push(".ethereum"); home.push(".ethereum");