diff --git a/dockerbuild.usage.txt b/dockerbuild.usage.txt new file mode 100644 index 0000000..016aab1 --- /dev/null +++ b/dockerbuild.usage.txt @@ -0,0 +1,12 @@ +Help: +dockerbuild --Help + +Init config: +dockerbuild ::init + +Build release use config or default rust: +dockerbuild build --release --target-dir linux_target + +dockerbuild :image:i386/rust:1.47 build --release --target-dir linux_i386_target + +dockerbuild :image:i386/rust:1.47 :mirror:git:*** build --release --target-dir linux_i386_target \ No newline at end of file diff --git a/src/main.rs b/src/main.rs index 2b6ebd8..a02165b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -24,12 +24,9 @@ fn main() { } information!("{} v{}", env!("CARGO_PKG_NAME"), env!("CARGO_PKG_VERSION")); - let docker_build_config = config::load_docker_build_config_or_default(); - let mut args_iter = env::args().skip(1).peekable(); - if args_iter.peek().map(|arg| vec!["--help", "-h", "::help"].contains(&&arg.as_str())).unwrap_or(false) { - println!("dockerbuild [::init]"); + println!("{}",include_str!("../dockerbuild.usage.txt")); return; } @@ -59,6 +56,7 @@ fn main() { return; } + let docker_build_config = config::load_docker_build_config_or_default(); let docker_build_image_opt = if let Some(first_arg) = args_iter.peek() { if first_arg.starts_with(":name:") { let name = first_arg[6..].to_string();