Skip to content

Commit

Permalink
SL-18837: Zap DOS line ending from curlver.h.
Browse files Browse the repository at this point in the history
Match the WHOLE line and replace it with only the version string.
  • Loading branch information
nat-goodspeed committed May 18, 2023
1 parent eab913b commit 5a4a82d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions build-cmd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,10 @@ OPENSSL_INCLUDE="${stage}"/packages/include/openssl

LIBCURL_HEADER_DIR="${CURL_SOURCE_DIR}"/include
LIBCURL_VERSION_HEADER_DIR="$LIBCURL_HEADER_DIR/curl"
version=$(perl -ne 's/#define LIBCURL_VERSION "([^"]+)"/$1/ && print' \
"$(cygpath -m "${LIBCURL_VERSION_HEADER_DIR}/curlver.h")")
version="$(sed -nE 's/#define LIBCURL_VERSION "([^"]+)".*$/\1/p' \
"$(cygpath -m "${LIBCURL_VERSION_HEADER_DIR}/curlver.h")")"
build=${AUTOBUILD_BUILD_ID:=0}
echo "${version}.${build}" > "${stage}/VERSION.txt"
echo "${version}-${build}" > "${stage}/VERSION.txt"

# Restore all .sos
restore_sos ()
Expand Down

0 comments on commit 5a4a82d

Please sign in to comment.