Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

install: support when a hyphen is passed #5697

Merged
merged 3 commits into from
Dec 23, 2023
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion src/uu/install/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -749,7 +749,21 @@ fn copy_file(from: &Path, to: &Path) -> UResult<()> {
/// Returns an empty Result or an error in case of failure.
///
fn strip_file(to: &Path, b: &Behavior) -> UResult<()> {
match process::Command::new(&b.strip_program).arg(to).output() {
// Check if the filename starts with a hyphen and adjust it
sylvestre marked this conversation as resolved.
Show resolved Hide resolved
let to = if to
.file_name()
.unwrap_or_default()
.to_str()
.unwrap_or_default()
.starts_with('-')
{
let mut new_path = PathBuf::from(".");
new_path.push(to);
new_path
} else {
to.to_path_buf()
};
match process::Command::new(&b.strip_program).arg(&to).output() {
Ok(o) => {
if !o.status.success() {
// Follow GNU's behavior: if strip fails, removes the target
Expand Down
28 changes: 28 additions & 0 deletions tests/by-util/test_install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,34 @@ fn test_install_and_strip_with_program() {
assert!(!stdout.contains(STRIP_SOURCE_FILE_SYMBOL));
}

#[cfg(all(unix, feature = "chmod"))]
#[test]
// FixME: Freebsd fails on 'No such file or directory'
#[cfg(not(any(windows, target_os = "freebsd")))]
sylvestre marked this conversation as resolved.
Show resolved Hide resolved
fn test_install_and_strip_with_program_hyphen() {
let scene = TestScenario::new(util_name!());

let at = &scene.fixtures;
let content = r#"#!/bin/sh
echo $1 &> /tmp/a.log
printf -- '%s\n' "$1" | grep '^[^-]'
"#;
at.write("no-hyphen", content);
scene.ccmd("chmod").arg("+x").arg("no-hyphen").succeeds();

at.touch("src");
scene
.ucmd()
.arg("-s")
.arg("--strip-program")
.arg("./no-hyphen")
.arg("--")
.arg("src")
.arg("-dest")
.succeeds()
.no_stderr();
}

#[test]
#[cfg(not(windows))]
fn test_install_and_strip_with_invalid_program() {
Expand Down
Loading