From 694013d300d192b5f647e31d3f34846d988645f4 Mon Sep 17 00:00:00 2001 From: murilo ijanc Date: Fri, 21 Nov 2025 19:44:54 -0300 Subject: Move git commands to function --- cli/template/build.rs | 47 ++++++++++++++++++++++++++++++++++------------- 1 file changed, 34 insertions(+), 13 deletions(-) (limited to 'cli') diff --git a/cli/template/build.rs b/cli/template/build.rs index 8174a53..6efb53f 100644 --- a/cli/template/build.rs +++ b/cli/template/build.rs @@ -1,21 +1,42 @@ -use std::process::Command; +// +// Copyright (c) 2025 murilo ijanc' +// +// Permission to use, copy, modify, and distribute this software for any +// purpose with or without fee is hereby granted, provided that the above +// copyright notice and this permission notice appear in all copies. +// +// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +// fn main() { - let git_hash = Command::new("git") - .args(["rev-parse", "--short=6", "HEAD"]) - .output() - .map(|out| String::from_utf8_lossy(&out.stdout).trim().to_string()) - .unwrap_or_else(|_| "unknown".into()); + println!("cargo:rerun-if-changed=.git/HEAD"); + println!("cargo:rerun-if-changed=.git/refs/heads"); - let git_date = Command::new("git") - .args(["show", "-s", "--format=%cd", "--date=short", "HEAD"]) - .output() - .map(|out| String::from_utf8_lossy(&out.stdout).trim().to_string()) - .unwrap_or_else(|_| "unknown".into()); + let git_hash = git_cmd(&["rev-parse", "--short=6", "HEAD"]); + + let git_date = + git_cmd(&["show", "-s", "--format=%cd", "--date=short", "HEAD"]); println!("cargo:rustc-env=GIT_HASH={}", git_hash); println!("cargo:rustc-env=BUILD_DATE={}", git_date); +} - println!("cargo:rerun-if-changed=.git/HEAD"); - println!("cargo:rerun-if-changed=.git/refs/heads"); +fn git_cmd(args: &[&str]) -> String { + use std::process::Command; + + Command::new("git") + .args(args) + .output() + .ok() + .filter(|output| output.status.success()) + .and_then(|output| String::from_utf8(output.stdout).ok()) + .map(|s| s.to_string()) + .filter(|s| !s.is_empty()) + .unwrap_or_else(|| "unknown".to_string()) } -- cgit v1.2.3