From b1593bc17c034aa4a24dbb41f4cb2d79bdaf48c6 Mon Sep 17 00:00:00 2001 From: Cebtenzzre Date: Sun, 3 Sep 2023 13:49:29 -0400 Subject: [PATCH] build-info : fix newlines correctly Why call 'echo' and then strip the newline from its output? --- scripts/build-info.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/scripts/build-info.sh b/scripts/build-info.sh index ed0d6c56a..d06c32957 100755 --- a/scripts/build-info.sh +++ b/scripts/build-info.sh @@ -3,21 +3,21 @@ BUILD_NUMBER="0" BUILD_COMMIT="unknown" -REV_LIST=$(git rev-list --count HEAD) +# git is broken on WSL so we need to strip extra newlines +REV_LIST=$(git rev-list --count HEAD | tr -d '\n') if [ $? -eq 0 ]; then BUILD_NUMBER=$REV_LIST fi -REV_PARSE=$(git rev-parse --short HEAD) +REV_PARSE=$(git rev-parse --short HEAD | tr -d '\n') if [ $? -eq 0 ]; then BUILD_COMMIT=$REV_PARSE fi echo "#ifndef BUILD_INFO_H" echo "#define BUILD_INFO_H" -echo "" -echo "#define BUILD_NUMBER $BUILD_NUMBER" | tr -d '\n' -echo "" -echo "#define BUILD_COMMIT \"$BUILD_COMMIT\"" | tr -d '\n' -echo "" +echo +echo "#define BUILD_NUMBER $BUILD_NUMBER" +echo "#define BUILD_COMMIT \"$BUILD_COMMIT\"" +echo echo "#endif // BUILD_INFO_H"