diff options
author | Norbert Preining <norbert@preining.info> | 2022-08-14 03:00:41 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-08-14 03:00:41 +0000 |
commit | e874d39878309e456c7ffe8d5fc6a91be571b50c (patch) | |
tree | 818c806809254f29f08c3e436a764cbdc566d59a /dviware/dvisvgm/ar-lib | |
parent | b229ca426d9d7fee0e3c48c58a00ffcf3da66cb0 (diff) |
CTAN sync 202208140300
Diffstat (limited to 'dviware/dvisvgm/ar-lib')
-rwxr-xr-x | dviware/dvisvgm/ar-lib | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/dviware/dvisvgm/ar-lib b/dviware/dvisvgm/ar-lib index 0baa4f6076..c349042c3f 100755 --- a/dviware/dvisvgm/ar-lib +++ b/dviware/dvisvgm/ar-lib @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2018 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # Written by Peter Rosin <peda@lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -53,7 +53,7 @@ func_file_conv () MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ func_file_conv () mingw) file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ elif test -n "$extract"; then esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then |