From b4d125dcc2e227b51d1e743f980a4f4ca31f102c Mon Sep 17 00:00:00 2001 From: Wilfried Goesgens Date: Tue, 4 Apr 2017 17:37:46 +0200 Subject: [PATCH] fix the linebreaks the wintendo uses --- Installation/Jenkins/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh index 4ec9729e21..d64c4ea088 100755 --- a/Installation/Jenkins/build.sh +++ b/Installation/Jenkins/build.sh @@ -617,7 +617,7 @@ if test -n "${TARGET_DIR}"; then else # we re-use a generic cpack tarball: ${PACKAGE_MAKE} TGZ_package - PKG_NAME=`grep CPACK_PACKAGE_FILE_NAME CPackConfig.cmake |sed -e 's;".$;;' -e 's;.*";;'` + PKG_NAME=`grep CPACK_PACKAGE_FILE_NAME CPackConfig.cmake | sed 's/\r//' |sed -e 's;".$;;' -e 's;.*";;'` TARFILE=arangodb-`uname`${TAR_SUFFIX}.tar.gz @@ -647,7 +647,7 @@ if test -n "${TARGET_DIR}"; then fi if test "`uname -o||true`" == "Cygwin"; then - SSLDIR=`grep FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL CMakeCache.txt |sed -e "s/.*optimized;//" -e "s/;.*//" -e "s;/lib.*lib;;" -e "s;\([a-zA-Z]*\):;/cygdrive/\1;"` + SSLDIR=`grep FIND_PACKAGE_MESSAGE_DETAILS_OpenSSL CMakeCache.txt | sed 's/\r//' |sed -e "s/.*optimized;//" -e "s/;.*//" -e "s;/lib.*lib;;" -e "s;\([a-zA-Z]*\):;/cygdrive/\1;"` DLLS=`find ${SSLDIR} -name \*.dll |grep -i release` cp ${DLLS} bin/${BUILD_CONFIG} fi