actions
/
mdBook
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix for different naming of nodejs on ubuntu 

also added static lifetime to str constants as these were failing on nightly windows
This commit is contained in:
Michal Budzynski 2017-05-22 17:06:38 +02:00
parent 1d141aa27b
commit 87f26a82b6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
build.rs
View File

@ -8,13 +8,13 @@ extern crate error_chain;
#[cfg(windows)] #[cfg(windows)]
mod execs { mod execs {
pub const NPM: &str = "npm.cmd"; pub const NPM: &'static str = "npm.cmd";
pub const STYLUS: &str = "stylus.cmd"; pub const STYLUS: &'static str = "stylus.cmd";
} }
#[cfg(not(windows))] #[cfg(not(windows))]
mod execs { mod execs {
pub const NPM: &str = "npm"; pub const NPM: &'static str = "npm";
pub const STYLUS: &str = "stylus"; pub const STYLUS: &'static str = "stylus";
} }
@ -68,7 +68,7 @@ fn run() -> Result<()> {
if let Ok(_) = env::var("CARGO_FEATURE_REGENERATE_CSS") { if let Ok(_) = env::var("CARGO_FEATURE_REGENERATE_CSS") {
// Check dependencies // Check dependencies
Program(execs::NPM).exists()?; Program(execs::NPM).exists()?;
Program("node").exists()?; Program("node").exists().or(Program("nodejs").exists())?;
Package("nib").exists()?; Package("nib").exists()?;
Package("stylus").exists()?; Package("stylus").exists()?;