mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
synced 2025-02-16 11:26:56 +00:00
Fix symlink creation for some files
rdfind was trying to duplicate symlinks created by WHENCE causing problems. Move the call before WHENCE creates symlinks. Reported-by: Timur Tabi <ttabi@nvidia.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
This commit is contained in:
parent
16b92b8d68
commit
4c55675d7a
@ -9,16 +9,12 @@ prune=no
|
|||||||
# shellcheck disable=SC2209
|
# shellcheck disable=SC2209
|
||||||
compress=cat
|
compress=cat
|
||||||
compext=
|
compext=
|
||||||
quiet=">/dev/null"
|
|
||||||
rdfind_results=/dev/null
|
|
||||||
|
|
||||||
while test $# -gt 0; do
|
while test $# -gt 0; do
|
||||||
case $1 in
|
case $1 in
|
||||||
-v | --verbose)
|
-v | --verbose)
|
||||||
# shellcheck disable=SC2209
|
# shellcheck disable=SC2209
|
||||||
verbose=echo
|
verbose=echo
|
||||||
quiet=
|
|
||||||
rdfind_results=results.txt
|
|
||||||
shift
|
shift
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@ -81,6 +77,14 @@ grep -E '^(RawFile|File):' WHENCE | sed -E -e 's/^(RawFile|File): */\1 /;s/"//g'
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
$verbose "Finding duplicate files"
|
||||||
|
rdfind -makesymlinks true -makeresultsfile false "$destdir" >/dev/null
|
||||||
|
find "$destdir" -type l | while read -r l; do
|
||||||
|
target="$(realpath "$l")"
|
||||||
|
$verbose "Correcting path for $l"
|
||||||
|
ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l"
|
||||||
|
done
|
||||||
|
|
||||||
# shellcheck disable=SC2162 # file/folder name can include escaped symbols
|
# shellcheck disable=SC2162 # file/folder name can include escaped symbols
|
||||||
grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
|
grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
|
||||||
if test -L "$f$compext"; then
|
if test -L "$f$compext"; then
|
||||||
@ -119,12 +123,6 @@ grep -E '^Link:' WHENCE | sed -e 's/^Link: *//g;s/-> //g' | while read f d; do
|
|||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
$verbose rdfind -makesymlinks true "$destdir" -outputname $rdfind_results "$quiet"
|
|
||||||
find "$destdir" -type l | while read -r l; do
|
|
||||||
target="$(realpath "$l")"
|
|
||||||
ln -fs "$(realpath --relative-to="$(dirname "$(realpath -s "$l")")" "$target")" "$l"
|
|
||||||
done
|
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
|
||||||
# vim: et sw=4 sts=4 ts=4
|
# vim: et sw=4 sts=4 ts=4
|
||||||
|
Loading…
Reference in New Issue
Block a user