From ce1fe5cf66c1fe4d4772fe9ef9f691fcd626d58d Mon Sep 17 00:00:00 2001 From: Frank Celler Date: Tue, 28 Aug 2018 17:27:34 +0200 Subject: [PATCH] added space as safeguard for sed replacement --- CMakeLists.txt | 12 ++++++------ Installation/release.sh | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69e281227e..7fbcf2ccdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -93,23 +93,23 @@ if (NOT DEFINED ARANGODB_VERSION_PATCH) set(ARANGODB_VERSION_RELEASE_TYPE "") set(ARANGODB_VERSION_RELEASE_NUMBER "") else() - unset(ARANGODB_VERSION_RELEASE_TYPE) - unset(ARANGODB_VERSION_RELEASE_NUMBER) + unset (ARANGODB_VERSION_RELEASE_TYPE) # do not remove space + unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space endif() # unset TYPE and NUMBER in case they are empty if (DEFINED ARANGODB_VERSION_RELEASE_TYPE) if (ARANGODB_VERSION_RELEASE_TYPE STREQUAL "") - unset(ARANGODB_VERSION_RELEASE_TYPE) - unset(ARANGODB_VERSION_RELEASE_NUMBER) + unset (ARANGODB_VERSION_RELEASE_TYPE) # do not remove space + unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space endif() else() - unset(ARANGODB_VERSION_RELEASE_NUMBER) + unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space endif() if (DEFINED ARANGODB_VERSION_RELEASE_NUMBER) if (ARANGODB_VERSION_RELEASE_NUMBER STREQUAL "") - unset(ARANGODB_VERSION_RELEASE_NUMBER) + unset (ARANGODB_VERSION_RELEASE_NUMBER) # do not remove space endif() endif() diff --git a/Installation/release.sh b/Installation/release.sh index 157822a7db..f9a5c5f44e 100755 --- a/Installation/release.sh +++ b/Installation/release.sh @@ -241,9 +241,9 @@ git fetch --tags # shellcheck disable=SC2002 cat CMakeLists.txt \ - | $SED -e "s~set(ARANGODB_VERSION_MAJOR.*~set(ARANGODB_VERSION_MAJOR \"$VERSION_MAJOR\")~" \ - | $SED -e "s~set(ARANGODB_VERSION_MINOR.*~set(ARANGODB_VERSION_MINOR \"$VERSION_MINOR\")~" \ - | $SED -e "s~set(ARANGODB_VERSION_PATCH.*~set(ARANGODB_VERSION_PATCH \"$VERSION_PATCH\")~" \ + | $SED -e "s~set(ARANGODB_VERSION_MAJOR.*~set(ARANGODB_VERSION_MAJOR \"$VERSION_MAJOR\")~" \ + | $SED -e "s~set(ARANGODB_VERSION_MINOR.*~set(ARANGODB_VERSION_MINOR \"$VERSION_MINOR\")~" \ + | $SED -e "s~set(ARANGODB_VERSION_PATCH.*~set(ARANGODB_VERSION_PATCH \"$VERSION_PATCH\")~" \ | $SED -e "s~set(ARANGODB_VERSION_RELEASE_TYPE.*~set(ARANGODB_VERSION_RELEASE_TYPE \"$VERSION_VERSION_RELEASE_TYPE\")~" \ | $SED -e "s~set(ARANGODB_VERSION_RELEASE_NUMBER.*~set(ARANGODB_VERSION_RELEASE_NUMBER \"$VERSION_VERSION_RELEASE_NUMBER\")~" \ > CMakeLists.txt.tmp