Fix cargo bootimage for Windows

phil-opp · phil-opp · commit 101eb43de403 · 2019-04-21T20:40:30.000+02:00
File names end with `.exe` on Windows.
diff --git a/Changelog.md b/Changelog.md
@@ -1,3 +1,5 @@
+- Fix `cargo bootimage` on Windows (there was a bug in the argument parsing)
+
 # 0.7.2
 
 - New features for `bootimage runner`
diff --git a/src/args.rs b/src/args.rs
@@ -6,11 +6,15 @@ use std::{env, mem};
 
 pub(crate) fn parse_args() -> Result<Command, ErrorMessage> {
     let mut args = env::args();
-    let executable_name = args.next().ok_or("no first argument (executable name)")?;
+    let is_cargo_bootimage = {
+        let executable_name = args.next().ok_or("no first argument (executable name)")?;
+        let file_stem = Path::new(&executable_name).file_stem().and_then(|s| s.to_str());
+        file_stem == Some("cargo-bootimage")
+    };
     let first = args.next();
     match first.as_ref().map(|s| s.as_str()) {
         Some("build") => parse_build_args(args),
-        Some("bootimage") if executable_name.ends_with("cargo-bootimage") => parse_build_args(args)
+        Some("bootimage") if is_cargo_bootimage => parse_build_args(args)
             .map(|cmd| match cmd {
                 Command::BuildHelp => Command::CargoBootimageHelp,
                 cmd => cmd,

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	+- Fix `cargo bootimage` on Windows (there was a bug in the argument parsing)
	`2`	`+`
`1`	`3`	`# 0.7.2`
`2`	`4`
`3`	`5`	- New features for `bootimage runner`