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

makepkg: avoid file|grep dependency for CRLF check

Browse source 
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Dave Reisner 2013-03-24 15:09:18 -04:00 • committed by Allan McRae
parent fa601c41ed
commit 87acfef166
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
scripts/makepkg.sh.in
View file

@ -2744,8 +2744,7 @@ if [[ ! -f $BUILDFILE ]]; then
source_safe "$BUILDFILE" source_safe "$BUILDFILE"
fi fi
else else
crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then
if [[ -n $crlftest ]]; then
error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF"
exit 1 exit 1
fi fi