From 820fd48475eb72cdd4f2715b26f44e99b35d81f4 Mon Sep 17 00:00:00 2001 From: Pat Thoyts Date: Mon, 13 Sep 2010 11:08:44 +0100 Subject: [PATCH] Chomp CRLF before feeding to tar when building netinstaller. If the project is checked out using autocrlf then tar dies on the dos line-endings. So trim them out using sed. Signed-off-by: Pat Thoyts --- share/msysGit/net/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/msysGit/net/release.sh b/share/msysGit/net/release.sh index b93e8993..00c4e979 100644 --- a/share/msysGit/net/release.sh +++ b/share/msysGit/net/release.sh @@ -22,11 +22,11 @@ mkdir "$TMPDIR" && cd "$TMPDIR" && (cd .. && test ! -f "$TMPPACK" || rm "$TMPPACK") && echo "Copying files" && -cat "$SHARE"/fileList.txt | +sed 's/\r//g' "$SHARE"/fileList.txt | (cd / && tar -c --file=- --files-from=-; echo $? > /tmp/exitstatus) | tar xvf - && test 0 = "$(cat /tmp/exitstatus)" && -cat "$SHARE"/fileList-mingw.txt | +sed 's/\r//g' "$SHARE"/fileList-mingw.txt | (cd /mingw && tar -c --file=- --files-from=-; echo $? > /tmp/exitstatus) | tar xvf - && -- 2.11.4.GIT