Merge branch 'master' into bugfix/blocks-list-css

2022-03-24 00:55:36 +00:00
parent d1c3f28df6 acba3bbf07
commit a653e4c284
5 changed files with 61 additions and 39 deletions
--- a/frontend/generate-config.js
+++ b/frontend/generate-config.js
@@ -51,9 +51,9 @@ if (process.env.DOCKER_COMMIT_HASH) {
 } else {
  try {
    const gitRevParse = spawnSync('git', ['rev-parse', '--short', 'HEAD']);
-  
    if (!gitRevParse.error) {
-      gitCommitHash = gitRevParse.stdout.toString('utf-8').replace(/[\n\r\s]+$/, '');
+      const output = gitRevParse.stdout.toString('utf-8').replace(/[\n\r\s]+$/, '');
+      gitCommitHash = output ? output : '?';
      console.log(`mempool revision ${gitCommitHash}`);
    } else if (gitRevParse.error.code === 'ENOENT') {
      console.log('git not found, cannot parse git hash');