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

Remove -f option from ln for POSIX compliance

Browse source 
Fixes FS#24893.

Conflicts:

	scripts/makepkg.sh.in
	scripts/repo-add.sh.in

Signed-off-by: Eric Bélanger <snowmaniscool@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
(cherry picked from commit 51ed7dff0d)
This commit is contained in:
Eric Bélanger 2011-06-26 15:13:48 -04:00 • committed by Dan McGee
parent 6b57118c15
commit c36dbf9711
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/makepkg.sh.in
View file

@ -509,7 +509,8 @@ download_sources() {
local file=$(get_filepath "$netfile" || true) local file=$(get_filepath "$netfile" || true)
if [[ -n "$file" ]]; then if [[ -n "$file" ]]; then
msg2 "$(gettext "Found %s")" "${file##*/}" msg2 "$(gettext "Found %s")" "${file##*/}"
ln -sf "$file" "$srcdir/" rm -f "$srcdir/$file"
ln -s "$file" "$srcdir/"
continue continue
fi fi
@ -877,8 +878,8 @@ tidy_install() {
# update symlinks to this manpage # update symlinks to this manpage
find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null | find ${MAN_DIRS[@]} -lname "$file" 2>/dev/null |
while read link ; do while read link ; do
rm -f "$link" rm -f "$link" "${link}.gz"
ln -sf "${file}.gz" "${link}.gz" ln -s "${file}.gz" "${link}.gz"
done done
# check file still exists (potentially already compressed due to hardlink) # check file still exists (potentially already compressed due to hardlink)
@ -1087,7 +1088,8 @@ create_package() {
fi fi
if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then if (( ! ret )) && [[ ! "$PKGDEST" -ef "${startdir}" ]]; then
ln -sf "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}" rm -f "${pkg_file/$PKGDEST/$startdir}"
ln -s "${pkg_file}" "${pkg_file/$PKGDEST/$startdir}"
ret=$? ret=$?
fi fi
@ -1169,7 +1171,8 @@ create_srcpackage() {
fi fi
if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then if (( ! ret )) && [[ ! "$SRCPKGDEST" -ef "${startdir}" ]]; then
ln -sf "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}" rm -f "${pkg_file/$SRCPKGDEST/$startdir}"
ln -s "${pkg_file}" "${pkg_file/$SRCPKGDEST/$startdir}"
ret=$? ret=$?
fi fi

5
scripts/repo-add.sh.in
View file

@ -525,8 +525,9 @@ if (( success )); then
[[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE" [[ -f $tmpdir/$filename ]] && mv "$tmpdir/$filename" "$REPO_DB_FILE"
dblink="${REPO_DB_FILE%.tar.*}" dblink="${REPO_DB_FILE%.tar.*}"
target=${REPO_DB_FILE##*/} target=${REPO_DB_FILE##*/}
ln -sf "$target" "$dblink" 2>/dev/null || \ rm -f "$dblink"
ln -f "$target" "$dblink" 2>/dev/null || \ ln -s "$target" "$dblink" 2>/dev/null || \
ln "$target" "$dblink" 2>/dev/null || \
cp "$REPO_DB_FILE" "$dblink" cp "$REPO_DB_FILE" "$dblink"
else else
msg "$(gettext "No packages modified, nothing to do.")" msg "$(gettext "No packages modified, nothing to do.")"