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

makepkg: workaround for zipman issues

Browse source 
This "fixes" two issues:

1) MAN_DIRS contains a glob by default so should not be quoted.  It is
not quoted anywhere else so this should not cause breakage...

2) the find statement returns 1 when some of MAN_DIRS are missing. This
appears to only be exposed when running makepkg as root (which it appears
some wrappers do...).

Signed-off-by: Allan McRae <allan@archlinux.org>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Allan McRae 2012-01-30 11:47:48 +10:00 • committed by Dan McGee
parent 825b4ff35a
commit 7ff1b945f6
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/makepkg.sh.in
View file

@ -999,7 +999,8 @@ tidy_install() {
# the '|| true' part keeps the script from bailing on the EOF returned # the '|| true' part keeps the script from bailing on the EOF returned
# by read at the end of the find output # by read at the end of the find output
IFS=$'\n' read -rd '' -a hardlinks < \ IFS=$'\n' read -rd '' -a hardlinks < \
<(find "${MAN_DIRS[@]}" \! -name "$file" -samefile "$manpage" 2>/dev/null) || true <(find ${MAN_DIRS[@]} \! -name "$file" -samefile "$manpage" \
2>/dev/null || true) || true
rm -f "${hardlinks[@]}" rm -f "${hardlinks[@]}"
# compress the original # compress the original
gzip -9 "$manpage" gzip -9 "$manpage"