From b5356bac0f26d091e6c5795afbaf52f07602f769 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Tue, 12 Dec 2017 16:37:18 +0100
Subject: [PATCH] tools: clean up release.js

---
 tools/release.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/tools/release.js b/tools/release.js
index cbcf739..4d049f3 100644
--- a/tools/release.js
+++ b/tools/release.js
@@ -10,7 +10,7 @@ let stdout;
 
 const version = process.argv[2];
 if (!/^\d+\.\d+\.\d+$/.test(version))
-    throw new Error('usage: release.js {version}');
+  throw new Error('usage: node release.js {version}');
 
 const distTag = `v${version}`;
 
@@ -19,7 +19,7 @@ process.chdir(projectRootDir);
 
 stdout = exec('git.exe status --porcelain -uno', utf8);
 if (stdout.match(/\S/))
-    throw new Error('git index or working directory not clean');
+  throw new Error('git index or working directory not clean');
 
 exec('cmake.exe --build . --target dist', inherit);
 
@@ -42,17 +42,17 @@ const distTree = getSHA(stdout);
 
 exec('git reset');
 
-stdout = exec(`git commit-tree ${distTree} ` + 
-              `-p ${previousTagCommit} ` + 
+stdout = exec(`git commit-tree ${distTree} ` +
+              `-p ${previousTagCommit} ` +
               `-p ${sourceCommit} ` +
               `-m "version ${version}"`, utf8);
-const distCommit = stdout.match(/[\w+]+/)[0];
-          
-stdout = exec(`git commit-tree ${sourceTree} ` + 
-              `-p ${sourceCommit} ` + 
+const distCommit = getSHA(stdout);
+
+stdout = exec(`git commit-tree ${sourceTree} ` +
+              `-p ${sourceCommit} ` +
               `-p ${distCommit} ` +
               `-m "dist: merge release tag ${distTag}"`, utf8);
-const mergeCommit = stdout.match(/[\w+]+/)[0];
+const mergeCommit = getSHA(stdout);
 
 exec(`git diff --stat ${previousTagCommit}..${distCommit}`, inherit);