Skip to content

Commit

Permalink
fixups
Browse files Browse the repository at this point in the history
  • Loading branch information
vszakats committed Sep 1, 2024
1 parent 3495902 commit 008a409
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion _build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1712,7 +1712,7 @@ build_single_target() {

if [ "${_OS}" = 'win' ]; then
_fn="${_DST}/BUILD-README.url"
cat <<EOF | sed 's/$/\x0d/' > "${_fn}"
cat <<EOF | sed 's/$/\r/' > "${_fn}"
[InternetShortcut]
URL=${_URL_BASE}
EOF
Expand Down
2 changes: 1 addition & 1 deletion _ci-linux-alpine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@ fi
# https://pkgs.alpinelinux.org/packages
# shellcheck disable=SC2086
apk add --no-cache curl git gpg gpg-agent rsync build-base cmake python3 \
zip tar xz jq openssl ${extra}
zip tar xz jq openssl sed ${extra}

./_build.sh
2 changes: 1 addition & 1 deletion cacert.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ _VER="$1"
url='https://www.mozilla.org/media/MPL/2.0/index.txt'
if [ "${_OS}" = 'win' ]; then
_fn="${_DST}/LICENSE.url"
cat <<EOF | sed 's/$/\x0d/' > "${_fn}"
cat <<EOF | sed 's/$/\r/' > "${_fn}"
[InternetShortcut]
URL=${url}
EOF
Expand Down
2 changes: 1 addition & 1 deletion curl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -555,7 +555,7 @@ _VER="$1"
# directly from the binary as strings, but curl creates most of these
# strings dynamically at runtime, so this is not possible
# (as of curl 7.83.1).
${_RUN_BIN} "${bin}" --disable --version | sed 's/$/\x0d/' | tee "../curl-version-${_CPU}.txt" || true
${_RUN_BIN} "${bin}" --disable --version | sed 's/\r//g' | tee "../curl-version-${_CPU}.txt" || true
fi
# Create package
Expand Down
2 changes: 1 addition & 1 deletion trurl.sh
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ _VER="$1"
# when running it from the unpacked release tarball.
LD_LIBRARY_PATH="$(pwd)/../curl/${_PP}/lib" \
DYLD_LIBRARY_PATH="$(pwd)/../curl/${_PP}/lib" \
${_RUN_BIN} "${bin}" --version | sed 's/$/\x0d/' | tee "../trurl-version-${_CPU}.txt" || true
${_RUN_BIN} "${bin}" --version | sed 's/\r//g' | tee "../trurl-version-${_CPU}.txt" || true
unset LD_DEBUG

if [ "${CW_TURL_TEST:-}" = '1' ] && \
Expand Down

0 comments on commit 008a409

Please sign in to comment.