diff options
| author |   Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-07 07:17:02 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2023-06-07 07:17:02 +0000 |
| commit | 4685ae62fa1fb860380bebde73b78b6cb5c0d09c (patch) | |
| tree | 6d51e021720dda4f97bdb1894d5a9be2c176f379 | |
| parent | 2023-06-07 07:01:58 UTC (diff) | |
| parent | eapi8-dosym.eclass: Don't add a spurious newline to the path (diff) | |
| download | gentoo-4685ae62fa1fb860380bebde73b78b6cb5c0d09c.tar.gz gentoo-4685ae62fa1fb860380bebde73b78b6cb5c0d09c.tar.bz2 gentoo-4685ae62fa1fb860380bebde73b78b6cb5c0d09c.zip | |
Merge updates from master
| -rw-r--r-- | eclass/eapi8-dosym.eclass | 2 | ||||
| -rwxr-xr-x | eclass/tests/eapi8-dosym.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/eclass/eapi8-dosym.eclass b/eclass/eapi8-dosym.eclass index 93b11dda7fd6..e139b74cfea0 100644 --- a/eclass/eapi8-dosym.eclass +++ b/eclass/eapi8-dosym.eclass @@ -31,7 +31,7 @@ esac _dosym8_canonicalize() { local path slash i prev out IFS=/ - read -r -d '' -a path <<< "$1" + read -r -d '' -a path < <(echo -n "$1") [[ $1 == /* ]] && slash=/ while true; do diff --git a/eclass/tests/eapi8-dosym.sh b/eclass/tests/eapi8-dosym.sh index 9290026a26de..cae66e3bb2ee 100755 --- a/eclass/tests/eapi8-dosym.sh +++ b/eclass/tests/eapi8-dosym.sh @@ -1,5 +1,5 @@ #!/bin/bash -# Copyright 2020 Gentoo Authors +# Copyright 2020-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -50,8 +50,10 @@ done teq . _dosym8_canonicalize . teq foo _dosym8_canonicalize foo teq foo _dosym8_canonicalize ./foo +teq foo _dosym8_canonicalize foo/. teq ../foo _dosym8_canonicalize ../foo teq ../baz _dosym8_canonicalize foo/bar/../../../baz +teq '*' _dosym8_canonicalize '*' for f in ref_dosym_r "dosym8 -r"; do teq ../../bin/foo ${f} /bin/foo /usr/bin/foo |