emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

install.sh: don't clobber dangling symlinks

Browse Source 
Symlinks in a subdirectory that is to become target rootfs are sometimes
dangling because they link to canonical file names that are not present
on the host, but are present relative to the target rootfs root. Don't
copy over dangling symlinks when noclobber is enabled

The -e test treats dangling symlinks as non-existent files. Add -h test
that returns true for all symlinks.

Cc: Yann E. MORIN <yann.morin.1998@free.fr>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Baruch Siach 2018-07-17 13:40:45 +03:00 committed by Denys Vlasenko
parent e8073519d8
commit 3d07446cef
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applets/install.sh
View File

@ -83,7 +83,7 @@ install -m 755 busybox "$prefix/bin/busybox" || exit 1
for i in $h; do for i in $h; do
appdir=`dirname "$i"` appdir=`dirname "$i"`
app=`basename "$i"` app=`basename "$i"`
if [ x"$noclobber" = x"1" ] && [ -e "$prefix/$i" ]; then if [ x"$noclobber" = x"1" ] && ([ -e "$prefix/$i" ] || [ -h "$prefix/$i" ]); then
echo " $prefix/$i already exists" echo " $prefix/$i already exists"
continue continue
fi fi