gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove unused default update manifest pubkeys (#9041)

Browse Source 
automerge
This commit is contained in:
Dan Albert
2020-03-23 21:57:43 -06:00
committed by GitHub
parent 9eb39df93f
commit 38b2957a8e
3 changed files with 8 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
install/src/defaults.rs
View File

@@ -20,12 +20,3 @@ lazy_static! {
})
};
}
pub fn update_manifest_pubkey(target: &str) -> Option<&str> {
match target {
"x86_64-apple-darwin" => Some("GRUP8YUGASLdu2gBwHstFgeVH28qppfuCaTzq5Yo7wRo"), // SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_apple_darwin
"x86_64-unknown-linux-gnu" => Some("FnKt2ES9iUJkjoprf2rL62xxBAxZLVgyA4SFexPGotFE"), // SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_unknown_linux_gnu
"x86_64-pc-windows-msvc" => Some("2Lrj5xDCHDmqwCgGwjVqAUUM84vLpj5dReYeoXL9vSXV"), // SOLANA_INSTALL_UPDATE_MANIFEST_KEYPAIR_x86_64_pc_windows_msvc
_ => None,
}
}

26
install/src/lib.rs
View File

@@ -105,21 +105,16 @@ pub fn main() -> Result<(), String> {
.long("no-modify-path")
.help("Don't configure the PATH environment variable"),
)
.arg({
let arg = Arg::with_name("update_manifest_pubkey")
.arg(
Arg::with_name("update_manifest_pubkey")
.short("p")
.long("pubkey")
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("Public key of the update manifest");
match defaults::update_manifest_pubkey(build_env::TARGET) {
Some(default_value) => arg.default_value(default_value),
None => arg,
}
})
.help("Public key of the update manifest"),
)
.arg(
Arg::with_name("explicit_release")
.value_name("release")
@@ -308,21 +303,16 @@ pub fn main_init() -> Result<(), String> {
.long("no-modify-path")
.help("Don't configure the PATH environment variable"),
)
.arg({
let arg = Arg::with_name("update_manifest_pubkey")
.arg(
Arg::with_name("update_manifest_pubkey")
.short("p")
.long("pubkey")
.value_name("PUBKEY")
.takes_value(true)
.required(true)
.validator(is_pubkey)
.help("Public key of the update manifest");
match defaults::update_manifest_pubkey(build_env::TARGET) {
Some(default_value) => arg.default_value(default_value),
None => arg,
}
})
.help("Public key of the update manifest"),
)
.arg(
Arg::with_name("explicit_release")
.value_name("release")