As a follow-up to 7046b44, actually ship dos2unix, too

And simplify the copy step a bit.

Signed-off-by: Sebastian Schuberth <sschuberth@gmail.com>
This commit is contained in:
Sebastian Schuberth 2014-03-18 23:19:10 +01:00
Родитель 5276b74f27
Коммит 9a9961ef01
1 изменённых файлов: 1 добавлений и 2 удалений

Просмотреть файл

@ -73,14 +73,13 @@ md5sum {bin,libexec/git-core}/git-*.exe libexec/git-core/git.exe |
sed -n -r "s/^$gitmd5\s+\*?(.*)/\1/p" > etc/fileList-builtins.txt &&
rm $(cat etc/fileList-builtins.txt) && # rm builtins - if needed we'll restore them after strip
(cd $MSYSGITROOT/mingw && tar cf - \
bin/*{tcl,tk,wish,gpg,msmtp,curl.exe,*.crt}* bin/connect.exe bin/iconv.exe\
bin/*{tcl,tk,wish,gpg,msmtp,curl.exe,*.crt}* bin/connect.exe bin/dos2unix.exe bin/hd2u.exe bin/iconv.exe\
bin/*{libcurl,libcrypto,libssl,libgsasl,libiconv,libintl}* \
bin/getcp.exe bin/rebase.exe \
bin/gzip.exe bin/gunzip.exe \
bin/{libpoppler-7.dll,pdfinfo.exe,pdftotext.exe} \
lib/{tcl,tk,dde,reg}* ) |
tar xf - &&
cp $MSYSGITROOT/mingw/bin/hd2u.exe bin/hd2u.exe &&
strip bin/{[a-fh-z],g[a-oq-z]}*.exe libexec/git-core/*.exe &&
if test -n "$DONT_REMOVE_BUILTINS"
then