Fix release.sh

Change-Id: I3b199c9d345147635be4001ee01c0a92848bd2fb

diff --git a/pkgconfig/cynara-creds-sd-bus/CMakeLists.txt b/pkgconfig/cynara-creds-sd-bus/CMakeLists.txt
index 76c15112fde165d58886c1b1c141016caa7904e0..ee3eb8c8bddbeb985b1cf5f9d937a3981b7de807 100644 (file)
--- a/pkgconfig/cynara-creds-sd-bus/CMakeLists.txt
+++ b/pkgconfig/cynara-creds-sd-bus/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2018.3020 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2018-2020 Samsung Electronics Co., Ltd All Rights Reserved
 #
 # This file is licensed under the terms of MIT License or the Apache License
 # Version 2.0 of your choice. See the LICENSE.MIT file for MIT license details.

diff --git a/release.sh b/release.sh
index 1a2568e3f39d3c8873f94396d611e534d8640173..c28ad387813361e217d89e1b791b2c425a682799 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -28,6 +28,7 @@ echo "Alfa-version of release script. Use on your own responsibility ;)"
 CURRENT_MAJOR=($(cat packaging/cynara.spec | grep Version | awk -F ":" '{print $2}' | awk -F "." '{print $2}'))
 CURRENT_MINOR=($(cat packaging/cynara.spec | grep Version | awk -F ":" '{print $2}' | awk -F "." '{print $3}'))
 CURRENT_VERSION="$CURRENT_MAJOR.$CURRENT_MINOR"
+CURRENT_VERSION_ESCAPED="$CURRENT_MAJOR\.$CURRENT_MINOR"
 
 # A POSIX variable
 OPTIND=1         # Reset in case getopts has been used previously in the shell.
@@ -69,12 +70,12 @@ echo
 if [[ $REPLY =~ ^[Yy]$ ]]
 then
     echo "Updating CMakeLists.txt files..."
-    find . -name "CMakeLists.txt" -type f -print0 | xargs -0 sed -i "s/${CURRENT_VERSION}/${NEW_VERSION}/g"
+    find . -name "CMakeLists.txt" -type f -print0 | xargs -0 sed -i "s/${CURRENT_VERSION_ESCAPED}/${NEW_VERSION}/g"
     echo "Updating spec files..."
-    find . -name "*.spec" -type f -print0 | xargs -0 sed -i "s/${CURRENT_VERSION}/${NEW_VERSION}/g"
+    find . -name "*.spec" -type f -print0 | xargs -0 sed -i "s/${CURRENT_VERSION_ESCAPED}/${NEW_VERSION}/g"
 
     echo "Checking left files..."
-    left_files=($(git grep "${CURRENT_VERSION}" | awk -F ":" '{print $1}' | sort -u))
+    left_files=($(git grep "${CURRENT_VERSION_ESCAPED}" | awk -F ":" '{print $1}' | sort -u))
 
     CHANGELOG_FILE="changelog"
     if [ ${#left_files[*]} -ne 1 ]
@@ -90,7 +91,7 @@ then
 
     echo "Updating changelog..."
 
-    RELEASE_COMMIT=`git log --pretty=oneline --abbrev-commit | grep "Release.*${CURRENT_VERSION}" | awk {'print $1'}`
+    RELEASE_COMMIT=`git log --pretty=oneline --abbrev-commit | grep "Release.*${CURRENT_VERSION_ESCAPED}" | awk {'print $1'}`
     IFS=$'\n'
     COMMIT_LIST=($(git log --pretty=oneline --abbrev-commit ${RELEASE_COMMIT}..HEAD | awk {'first = $1; $1=""; print $0'}|sed 's/^ //g'))
 #COMMIT_LIST=`git log --pretty=oneline --abbrev-commit ${RELEASE_COMMIT}..HEAD | awk {'first = $1; $1=""; print $0'}|sed 's/^ //g'`

diff --git a/src/helpers/creds-sd-bus/CMakeLists.txt b/src/helpers/creds-sd-bus/CMakeLists.txt
index 18d344220778a8922fdcb715a1d2978879d0dae9..2037b8618a5366c1a53cb48e71005d6f8c916984 100644 (file)
--- a/src/helpers/creds-sd-bus/CMakeLists.txt
+++ b/src/helpers/creds-sd-bus/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2018.3020 Samsung Electronics Co., Ltd All Rights Reserved
+# Copyright (c) 2018-2020 Samsung Electronics Co., Ltd All Rights Reserved
 #
 # This file is licensed under the terms of MIT License or the Apache License
 # Version 2.0 of your choice. See the LICENSE.MIT file for MIT license details.