Merge pull request #464 from danvk/sourcemap

[dygraphs.git] / release.sh

diff --git a/release.sh b/release.sh
index a945999..909e109 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -26,6 +26,18 @@ if [ $? -ne 0 ]; then
   exit 1
 fi
 
+grep "$VERSION" package.json
+if [ $? -ne 0 ]; then
+  echo "Version in package.json doesn't match command line argument." >&2
+  exit 1
+fi
+
+grep "v$VERSION" bower.json
+if [ $? -ne 0 ]; then
+  echo "Version in bower.json doesn't match command line argument." >&2
+  exit 1
+fi
+
 make lint test test-combined
 if [ $? -ne 0 ]; then
   echo "Tests failed. Won't release!" >&2
@@ -59,7 +71,7 @@ echo "Pushing the new version to dygraphs.com..."
 
 echo "Success!\n"
 echo "Don't forget to merge changes on this branch back into master:"
-echo "git merge $branch"
+echo "git merge --no-ff $branch"
 
 # Discourage users from working on the "releases" branch.
 git checkout master