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.

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>
This commit is contained in:
Eric Bélanger 2011-06-26 15:13:48 -04:00 • committed by Dan McGee
parent f5dc5c46e0
commit 51ed7dff0d
2 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
scripts/makepkg.sh.in
View file

@ -518,7 +518,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
@ -878,8 +879,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)
@ -1187,9 +1188,13 @@ create_package() {
create_signature "$pkg_file" create_signature "$pkg_file"
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=$?
[[ -f $pkg_file.sig ]] && ln -sf "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig" if [[ -f $pkg_file.sig ]]; then
rm -f "${pkg_file/$PKGDEST/$startdir}.sig"
ln -s "$pkg_file.sig" "${pkg_file/$PKGDEST/$startdir}.sig"
fi
fi fi
if (( ret )); then if (( ret )); then
@ -1276,7 +1281,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

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

@ -613,12 +613,14 @@ if (( success )); then
[[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig" [[ -f $tmpdir/$filename.sig ]] && mv "$tmpdir/$filename.sig" "$REPO_DB_FILE.sig"
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"
if [[ -f "$target.sig" ]]; then if [[ -f "$target.sig" ]]; then
ln -sf "$target.sig" "$dblink.sig" 2>/dev/null || \ rm -f "$dblink.sig"
ln -f "$target.sig" "$dblink.sig" 2>/dev/null || \ ln -s "$target.sig" "$dblink.sig" 2>/dev/null || \
ln "$target.sig" "$dblink.sig" 2>/dev/null || \
cp "$REPO_DB_FILE.sig" "$dblink.sig" cp "$REPO_DB_FILE.sig" "$dblink.sig"
fi fi
else else