X-Git-Url: https://adrianiainlam.tk/git/?a=blobdiff_plain;f=release.sh;h=21c0c34dcadab666382c16a923f8196cc1b0919b;hb=319d0361d2e512ed8049dfedffd79254e491201c;hp=a94599942a4ff7fa0233020e3e9b733e6cdb4b65;hpb=9023a6d6bddd368690ec999ba919dbf1e48a4002;p=dygraphs.git

diff --git a/release.sh b/release.sh
index a945999..21c0c34 100755
--- a/release.sh
+++ b/release.sh
@@ -26,11 +26,31 @@ 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
+
+grep "$VERSION" releases.json
+if [ $? -ne 0 ]; then
+  echo "Version $VERSION does not appear in releases.json." >&2
+  exit 1
+fi
+
+rm dygraph-combined.js  # changes to this will make the tests fail.
 make lint test test-combined
 if [ $? -ne 0 ]; then
   echo "Tests failed. Won't release!" >&2
   exit 1
 fi
+git reset --hard  # make test-combined deletes the source map
 
 # Push a permanent copy of documentation & generated files to a versioned copy
 # of the site. This is where the downloadable files are generated.
@@ -59,7 +79,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