Merge pull request #4859 from doitian/fix-release-scripts

fix release scripts

Author: doitian

devtools/release/bump.sh

@@ -12,7 +12,7 @@ main() {
   local v="$1"
   find . -name 'Cargo.toml' -print0 | xargs -0 sed -i.bak \
     -e 's/^version = .*/version = "'"$v"'"/' \
-    -e 's/\({.*path = ".*",.* version = "= \)[^"]*/\1'"$v"'/'
+    -e 's/\({.*path = ".*",.* version = "= \?\)[^"]*/\1'"$v"'/'
   find . -name 'Cargo.toml.bak' -exec rm -f {} \;
   sed -i.bak 's/badge\/version-.*-orange/badge\/version-'"$(echo "$v" | sed s/-/--/g)"'-orange/' README.md
   rm -f README.md.bak

devtools/release/release-pkg.sh

@@ -3,20 +3,20 @@
 on_push_pkg() {
   BRANCH=$(git symbolic-ref --quiet HEAD)
   BRANCH="${BRANCH#refs/heads/}"
-  VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)"
+  VERSION="v$(sed -n '/^version = "\(.*\)"/{s//\1/p;q}' Cargo.toml)"
   echo "$BRANCH -> upstream/$BRANCH"
   echo "$BRANCH -> upstream/pkg/$VERSION"
 
   git push upstream "$BRANCH" "$BRANCH:pkg/$VERSION"
 }
 
 on_tag() {
-  VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)"
+  VERSION="v$(sed -n '/^version = "\(.*\)"/{s//\1/p;q}' Cargo.toml)"
   git tag -s -m "$VERSION" "$VERSION"
 }
 
 on_push_tag() {
-  VERSION="v$(sed -n 's/^version = "\(.*\)"/\1/p' Cargo.toml)"
+  VERSION="v$(sed -n '/^version = "\(.*\)"/{s//\1/p;q}' Cargo.toml)"
   git push upstream "$VERSION"
 }