[pacman-dev] [PATCH] makepkg: avoid file|grep dependency for CRLF check
24 Mar
2013
24 Mar
'13
7:09 p.m.
Signed-off-by: Dave Reisner <dreisner@archlinux.org> --- scripts/makepkg.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 73f45d4..a63b267 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -2744,8 +2744,7 @@ if [[ ! -f $BUILDFILE ]]; then source_safe "$BUILDFILE" fi else - crlftest=$(file "$BUILDFILE" | grep -F 'CRLF' || true) - if [[ -n $crlftest ]]; then + if [[ $(<"$BUILDFILE") = *$'\r'* ]]; then error "$(gettext "%s contains %s characters and cannot be sourced.")" "$BUILDFILE" "CRLF" exit 1 fi -- 1.8.2
6 Apr
6 Apr
5:38 a.m.
New subject: [pacman-dev] [PATCH] makepkg: avoid file|grep dependency for CRLF check
On 25/03/13 05:09, Dave Reisner wrote:
Signed-off-by: Dave Reisner <dreisner@archlinux.org> ---
Ack -> master. Allan
4269
Age (days ago)
4282
Last active (days ago)
1 comments
2 participants
participants (2)
-
Allan McRae
-
Dave Reisner