Merge pull request #238 from sachaaaaa/commit_hash_about

Show commit hash in About window for beta builds

Gruntfile.js

@@ -265,15 +265,35 @@ module.exports = grunt => {
     });
   });
 
+  function updateLocalConfig(update) {
+    const environment = process.env.SIGNAL_ENV || 'development';
+    const configPath = `config/local-${environment}.json`;
+    let localConfig;
+    try {
+      localConfig = grunt.file.readJSON(configPath);
+    } catch (e) {
+      //
+    }
+    localConfig = {
+      ...localConfig,
+      ...update,
+    };
+    grunt.file.write(configPath, `${JSON.stringify(localConfig)}\n`);
+  }
+
   grunt.registerTask('getExpireTime', () => {
     grunt.task.requires('gitinfo');
     const gitinfo = grunt.config.get('gitinfo');
     const committed = gitinfo.local.branch.current.lastCommitTime;
     const time = Date.parse(committed) + 1000 * 60 * 60 * 24 * 90;
-    grunt.file.write(
+    updateLocalConfig({ buildExpiration: time });
-      'config/local-production.json',
+  });
-      `${JSON.stringify({ buildExpiration: time })}\n`
+
-    );
+  grunt.registerTask('getCommitHash', () => {
+    grunt.task.requires('gitinfo');
+    const gitinfo = grunt.config.get('gitinfo');
+    const hash = gitinfo.local.branch.current.SHA;
+    updateLocalConfig({ commitHash: hash });
   });
 
   grunt.registerTask('clean-release', () => {
@@ -505,5 +525,6 @@ module.exports = grunt => {
     'copy:deps',
     'sass',
     'date',
+    'getCommitHash',
   ]);
 };

about.html

@@ -36,6 +36,7 @@
   <img src='images/icon_256.png' width='250' height='250'>
 
   <div class='version'></div>
+  <div class='commitHash'></div>
   <div class='environment'></div>
   <div>
     <a href="https://loki.network">loki.network</a>

about_preload.js

@@ -10,6 +10,7 @@ const localeMessages = ipcRenderer.sendSync('locale-data');
 
 window.getEnvironment = () => config.environment;
 window.getVersion = () => config.version;
+window.getCommitHash = () => config.commitHash;
 window.getAppInstance = () => config.appInstance;
 
 window.closeAbout = () => ipcRenderer.send('close-about');

config/default.json

@@ -8,6 +8,7 @@
   "disableAutoUpdate": false,
   "openDevTools": false,
   "buildExpiration": 0,
+  "commitHash": "",
   "certificateAuthority":
     "-----BEGIN CERTIFICATE-----\nMIID7zCCAtegAwIBAgIJAIm6LatK5PNiMA0GCSqGSIb3DQEBBQUAMIGNMQswCQYD\nVQQGEwJVUzETMBEGA1UECAwKQ2FsaWZvcm5pYTEWMBQGA1UEBwwNU2FuIEZyYW5j\naXNjbzEdMBsGA1UECgwUT3BlbiBXaGlzcGVyIFN5c3RlbXMxHTAbBgNVBAsMFE9w\nZW4gV2hpc3BlciBTeXN0ZW1zMRMwEQYDVQQDDApUZXh0U2VjdXJlMB4XDTEzMDMy\nNTIyMTgzNVoXDTIzMDMyMzIyMTgzNVowgY0xCzAJBgNVBAYTAlVTMRMwEQYDVQQI\nDApDYWxpZm9ybmlhMRYwFAYDVQQHDA1TYW4gRnJhbmNpc2NvMR0wGwYDVQQKDBRP\ncGVuIFdoaXNwZXIgU3lzdGVtczEdMBsGA1UECwwUT3BlbiBXaGlzcGVyIFN5c3Rl\nbXMxEzARBgNVBAMMClRleHRTZWN1cmUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw\nggEKAoIBAQDBSWBpOCBDF0i4q2d4jAXkSXUGpbeWugVPQCjaL6qD9QDOxeW1afvf\nPo863i6Crq1KDxHpB36EwzVcjwLkFTIMeo7t9s1FQolAt3mErV2U0vie6Ves+yj6\ngrSfxwIDAcdsKmI0a1SQCZlr3Q1tcHAkAKFRxYNawADyps5B+Zmqcgf653TXS5/0\nIPPQLocLn8GWLwOYNnYfBvILKDMItmZTtEbucdigxEA9mfIvvHADEbteLtVgwBm9\nR5vVvtwrD6CCxI3pgH7EH7kMP0Od93wLisvn1yhHY7FuYlrkYqdkMvWUrKoASVw4\njb69vaeJCUdU+HCoXOSP1PQcL6WenNCHAgMBAAGjUDBOMB0GA1UdDgQWBBQBixjx\nP/s5GURuhYa+lGUypzI8kDAfBgNVHSMEGDAWgBQBixjxP/s5GURuhYa+lGUypzI8\nkDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQB+Hr4hC56m0LvJAu1R\nK6NuPDbTMEN7/jMojFHxH4P3XPFfupjR+bkDq0pPOU6JjIxnrD1XD/EVmTTaTVY5\niOheyv7UzJOefb2pLOc9qsuvI4fnaESh9bhzln+LXxtCrRPGhkxA1IMIo3J/s2WF\n/KVYZyciu6b4ubJ91XPAuBNZwImug7/srWvbpk0hq6A6z140WTVSKtJG7EP41kJe\n/oF4usY5J7LPkxK3LWzMJnb5EIJDmRvyH8pyRwWg6Qm6qiGFaI4nL8QU4La1x2en\n4DGXRaLMPRwjELNgQPodR38zoCMuA8gHZfZYYoZ7D7Q1wNUiVHcxuFrEeBaYJbLE\nrwLV\n-----END CERTIFICATE-----\n",
   "import": false,

js/about_start.js

@@ -1,7 +1,12 @@
 /* global $: false */
 
 // Add version
-$('.version').text(`v${window.getVersion()}`);
+const version = window.getVersion();
+$('.version').text(`v${version}`);
+
+if (/beta/.test(version)) {
+  $('.commitHash').text(window.getCommitHash());
+}
 
 // Add debugging metadata - environment if not production, app instance name
 const states = [];

main.js

@@ -143,6 +143,7 @@ function prepareURL(pathSegments, moreKeys) {
       locale: locale.name,
       version: app.getVersion(),
       buildExpiration: config.get('buildExpiration'),
+      commitHash: config.get('commitHash'),
       serverUrl: config.get('serverUrl'),
       localUrl: config.get('localUrl'),
       cdnUrl: config.get('cdnUrl'),

package.json

@@ -3,7 +3,7 @@
   "productName": "Loki Messenger",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/sloki-project/loki-messenger.git",
-  "version": "1.21.1",
+  "version": "0.0.0-beta1",
   "license": "GPL-3.0",
   "author": {
     "name": "Open Whisper Systems",

preload.js

@@ -26,6 +26,7 @@ window.getAppInstance = () => config.appInstance;
 window.getVersion = () => config.version;
 window.isImportMode = () => config.importMode;
 window.getExpiration = () => config.buildExpiration;
+window.getCommitHash = () => config.commitHash;
 window.getNodeVersion = () => config.node_version;
 window.getHostName = () => config.hostname;
 window.getServerTrustRoot = () => config.serverTrustRoot;