fix #1637: git commit in the About box

Gruntfile.js

@@ -2,6 +2,7 @@
 
 const fs = require('fs-extra');
 const path = require('path');
+const { execSync } = require('child_process');
 const debug = require('debug');
 
 const webpackConfig = require('./build/webpack.config');
@@ -33,12 +34,12 @@ module.exports = function (grunt) {
     const getCodeSignConfig = () =>
         skipSign ? { identities: {} } : require('./keys/codesign.json');
 
+    const sha = execSync('git rev-parse --short HEAD').toString('utf8').trim();
+
     const webpackOptions = {
         date,
         beta: !!grunt.option('beta'),
-        get sha() {
-            return grunt.config.get('gitinfo.local.branch.current.shortSHA');
-        }
+        sha
     };
 
     const windowsAppVersionString = {
@@ -51,16 +52,6 @@ module.exports = function (grunt) {
 
     grunt.initConfig({
         noop: { noop: {} },
-        gitinfo: {
-            branch: {
-                current: {
-                    SHA: 'Current HEAD SHA',
-                    shortSHA: 'Current HEAD short SHA',
-                    name: 'Current branch name',
-                    lastCommitTime: 'Last commit time'
-                }
-            }
-        },
         clean: {
             dist: ['dist', 'tmp'],
             desktop: ['tmp/desktop', 'dist/desktop']
@@ -325,7 +316,7 @@ module.exports = function (grunt) {
                 asar: true,
                 appCopyright: `Copyright © ${year} Antelle`,
                 appVersion: pkg.version,
-                buildVersion: '<%= gitinfo.local.branch.current.shortSHA %>'
+                buildVersion: sha
             },
             linux: {
                 options: {
@@ -464,9 +455,7 @@ module.exports = function (grunt) {
             options: {
                 vars: {
                     version: pkg.version,
-                    rev() {
-                        return grunt.config.get('gitinfo.local.branch.current.shortSHA');
-                    },
+                    rev: sha,
                     homepage: pkg.homepage
                 }
             },
@@ -530,9 +519,7 @@ module.exports = function (grunt) {
                     description: pkg.description,
                     author: pkg.author,
                     homepage: pkg.homepage,
-                    rev() {
-                        return grunt.config.get('gitinfo.local.branch.current.shortSHA');
-                    }
+                    rev: sha
                 }
             },
             'linux-x64': {

grunt.entrypoints.js

@@ -21,7 +21,6 @@ module.exports = function(grunt) {
     ]);
 
     grunt.registerTask('desktop-linux', 'Build desktop apps on linux', [
-        'gitinfo',
         'clean:desktop',
         'build-desktop-app-content',
         'build-desktop-executables-linux',
@@ -31,7 +30,6 @@ module.exports = function(grunt) {
     ]);
 
     grunt.registerTask('desktop-darwin', 'Build desktop apps on macos', [
-        'gitinfo',
         'clean:desktop',
         'build-desktop-app-content',
         'build-desktop-executables-darwin',
@@ -39,7 +37,6 @@ module.exports = function(grunt) {
     ]);
 
     grunt.registerTask('desktop-win32', 'Build desktop apps on windows', [
-        'gitinfo',
         'clean:desktop',
         'build-desktop-app-content',
         'build-desktop-executables-win32',
@@ -75,7 +72,7 @@ module.exports = function(grunt) {
         'chmod:linux-desktop-x64',
         'copy:native-modules-linux-x64'
     ]);
-    
+
     grunt.registerTask('test', 'Build and run tests', [
         'build-test',
         'run-test'

grunt.tasks.js

@@ -2,7 +2,6 @@ module.exports = function (grunt) {
     const sign = !grunt.option('skip-sign');
 
     grunt.registerTask('build-web-app', [
-        'gitinfo',
         'clean',
         'eslint',
         'copy:html',
@@ -118,7 +117,6 @@ module.exports = function (grunt) {
     ]);
 
     grunt.registerTask('build-desktop', [
-        'gitinfo',
         'clean:desktop',
         'build-desktop-app-content',
         'build-desktop-executables',

package-lock.json

@@ -8213,25 +8213,6 @@
         }
       }
     },
-    "grunt-gitinfo": {
-      "version": "github:keeweb/grunt-gitinfo#b61aaeda40cac9c8b0d18fa88f660c0dbacfffa3",
-      "from": "github:keeweb/grunt-gitinfo#b61aaed",
-      "requires": {
-        "async": "~2.6.1",
-        "getobject": "~0.1.0",
-        "lodash": "~4.17.11"
-      },
-      "dependencies": {
-        "async": {
-          "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/async/-/async-2.6.3.tgz",
-          "integrity": "sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==",
-          "requires": {
-            "lodash": "^4.17.14"
-          }
-        }
-      }
-    },
     "grunt-inline-alt": {
       "version": "github:keeweb/grunt-inline-alt#ec9f6ad885b958d4f766ddda5d7eeacec491d159",
       "from": "github:keeweb/grunt-inline-alt#ec9f6ad",

package.json

@@ -56,7 +56,6 @@
         "grunt-contrib-watch": "1.1.0",
         "grunt-electron": "12.0.0",
         "grunt-eslint": "23.0.0",
-        "grunt-gitinfo": "github:keeweb/grunt-gitinfo#b61aaed",
         "grunt-inline-alt": "github:keeweb/grunt-inline-alt#ec9f6ad",
         "grunt-string-replace": "1.3.1",
         "grunt-webpack": "4.0.2",

release-notes.md

@@ -1,5 +1,8 @@
 Release notes
 -------------
+##### v1.16.1 (TBD)
+`-` fix #1637: git commit in the About box  
+
 ##### v1.16.0 (2020-11-29)
 `+` updated icons and visual design  
 `+` new Dark (default) and Light themes