From c0edde7abe4170fb338134ad7fc1f995dd3b813a Mon Sep 17 00:00:00 2001 From: Reed Allman Date: Wed, 2 Aug 2017 21:16:24 -0700 Subject: [PATCH] update bump script to be slightly less brittle, all perl syntax --- cli/release.sh | 6 +++--- fnlb/release.sh | 6 +++--- release.sh | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/release.sh b/cli/release.sh index 5a6ed503d..677f77130 100755 --- a/cli/release.sh +++ b/cli/release.sh @@ -15,12 +15,12 @@ fi git pull version_file="version.go" -if [ -z $(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) ]; then +if [ -z $(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) ]; then echo "did not find semantic version in $version_file" exit 1 fi -perl -i -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e' $version_file -version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) +perl -i -pe 's/(?<= = ")\d+\.\d+\.\K(\d+)/$1+1/e' $version_file +version=$(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) echo "Version: $version" #cd lambda diff --git a/fnlb/release.sh b/fnlb/release.sh index fb4dcecd6..71c4ce4fe 100755 --- a/fnlb/release.sh +++ b/fnlb/release.sh @@ -18,12 +18,12 @@ fi git pull version_file="main.go" -if [ -z $(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) ]; then +if [ -z $(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) ]; then echo "did not find semantic version in $version_file" exit 1 fi -perl -i -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e' $version_file -version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) +perl -i -pe 's/(?<= = ")\d+\.\d+\.\K(\d+)/$1+1/e' $version_file +version=$(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) echo "Version: $version" make docker-build diff --git a/release.sh b/release.sh index 1f641ee30..160967d43 100755 --- a/release.sh +++ b/release.sh @@ -18,12 +18,12 @@ fi git pull version_file="api/version/version.go" -if [ -z $(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) ]; then +if [ -z $(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) ]; then echo "did not find semantic version in $version_file" exit 1 fi -perl -i -pe 's/\d+\.\d+\.\K(\d+)/$1+1/e' $version_file -version=$(grep -m1 -Eo "[0-9]+\.[0-9]+\.[0-9]+" $version_file) +perl -i -pe 's/(?<= = ")\d+\.\d+\.\K(\d+)/$1+1/e' $version_file +version=$(grep -m1 -Po '(?<= = ")\d+\.\d+\.\d+' $version_file) echo "Version: $version" make docker-build