applets/install: respect noclobber for script wrappers too
Simplify the handling of --noclobber so that it applies to all types of installation types, even to script wrappers. Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
parent
a034cab095
commit
84be5ce0d8
@ -77,6 +77,10 @@ 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 [ "$noclobber" = "1" ] && [ -e "$prefix/$i" ]; then
|
||||||
|
echo " $prefix/$i already exists"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
mkdir -p "$prefix/$appdir" || exit 1
|
mkdir -p "$prefix/$appdir" || exit 1
|
||||||
if [ "$scriptwrapper" = "y" ]; then
|
if [ "$scriptwrapper" = "y" ]; then
|
||||||
if [ "$swrapall" != "y" ] && [ "$i" = "/bin/sh" ]; then
|
if [ "$swrapall" != "y" ] && [ "$i" = "/bin/sh" ]; then
|
||||||
@ -90,12 +94,8 @@ for i in $h; do
|
|||||||
elif [ "$binaries" = "y" ]; then
|
elif [ "$binaries" = "y" ]; then
|
||||||
# Copy the binary over rather
|
# Copy the binary over rather
|
||||||
if [ -e $sharedlib_dir/$app ]; then
|
if [ -e $sharedlib_dir/$app ]; then
|
||||||
if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
|
echo " Copying $sharedlib_dir/$app to $prefix/$i"
|
||||||
echo " Copying $sharedlib_dir/$app to $prefix/$i"
|
cp -pPR $sharedlib_dir/$app $prefix/$i || exit 1
|
||||||
cp -pPR $sharedlib_dir/$app $prefix/$i || exit 1
|
|
||||||
else
|
|
||||||
echo " $prefix/$i already exists"
|
|
||||||
fi
|
|
||||||
else
|
else
|
||||||
echo "Error: Could not find $sharedlib_dir/$app"
|
echo "Error: Could not find $sharedlib_dir/$app"
|
||||||
exit 1
|
exit 1
|
||||||
@ -123,12 +123,8 @@ for i in $h; do
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
|
echo " $prefix/$i -> $bb_path"
|
||||||
echo " $prefix/$i -> $bb_path"
|
ln $linkopts "$bb_path" "$prefix/$i" || exit 1
|
||||||
ln $linkopts "$bb_path" "$prefix/$i" || exit 1
|
|
||||||
else
|
|
||||||
echo " $prefix/$i already exists"
|
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user