diff --git a/nsis/installer.nsi b/nsis/installer.nsi index a245fbd31..c853eeb5b 100644 --- a/nsis/installer.nsi +++ b/nsis/installer.nsi @@ -98,6 +98,7 @@ function un.onInit #Verify the uninstaller - last chance to back out MessageBox MB_OKCANCEL "Permanantly remove ${APPNAME}?" IDOK next Abort + next: !insertmacro VerifyUserIsAdmin functionEnd @@ -121,4 +122,5 @@ section "uninstall" # Remove uninstaller information from the registry DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${COMPANYNAME} ${APPNAME}" + sectionEnd diff --git a/parity/url.rs b/parity/url.rs index 672de4a7b..8e6f31222 100644 --- a/parity/url.rs +++ b/parity/url.rs @@ -31,7 +31,7 @@ mod shell { pub use self::winapi::SW_SHOWNORMAL as Normal; } -#[cfg(target_os = "windows")] +#[cfg(windows)] pub fn open(url: &str) { use std::ffi::CString; use std::ptr; @@ -46,12 +46,12 @@ pub fn open(url: &str) { } } -#[cfg(target_os = "macos")] +#[cfg(macos)] pub fn open(url: &str) { let _ = std::process::Command::new("open").arg(url).output(); } -#[cfg(target_os = "linux")] +#[cfg(linux)] pub fn open(url: &str) { let _ = std::process::Command::new("xdg-open").arg(url).output(); }