bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makepkg: compare paths using bash test

Browse source 
Compare paths using bash's "-ef" rather than by string tests as this
takes symlinks into account.  This will prevent issues similar to those
in FS#20922 if (e.g.) $PKGDEST is a symlink to $startdir.

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2010-10-04 18:42:10 +10:00 • committed by Dan McGee
parent f2296aab89
commit 960c2cdcf7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scripts/makepkg.sh.in
View file

@ -1061,7 +1061,7 @@ create_package() {
exit 1 # TODO: error code
fi
if (( ! ret )) && [[ "$PKGDEST" != "${startdir}" ]]; then
if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then
ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
ret=$?
fi
@ -1142,7 +1142,7 @@ create_srcpackage() {
exit 1 # TODO: error code
fi
if (( ! ret )) && [[ "$SRCPKGDEST" != "${startdir}" ]]; then
if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
ret=$?
fi
@ -1691,7 +1691,7 @@ fi
if (( CLEANCACHE )); then
#fix flyspray feature request #5223
if [[ -n $SRCDEST && $SRCDEST != $startdir ]]; then
if [[ -n $SRCDEST && ! $SRCDEST -ef "${startdir}" ]]; then
msg "$(gettext "Cleaning up ALL files from %s.")" "$SRCDEST"
echo -n "$(gettext " Are you sure you wish to do this? ")"
echo -n "$(gettext "[y/N]")"