Merge en-us (v6.5.4)

.eslintrc.js

@@ -1,60 +1,61 @@
+"use strict";
 module.exports = {
-  env: {
-    commonjs: true,
-    es6: true,
-    node: true
-  },
-  extends: [
-    'standard'
-  ],
-  parserOptions: {
-    ecmaVersion: 2018,
-    "sourceType": "script"
-  },
-  "rules": {
-    "comma-dangle": [
-      "error",
-      {
-        "arrays": "always-multiline",
-        "exports": "always-multiline",
-        "functions": "never",
-        "imports": "always-multiline",
-        "objects": "always-multiline"
-      }
-    ],
-    "indent": [
-      "error",
-      "tab",
-      {
-        "SwitchCase": 1
-      }
-    ],
-    "no-tabs": [
-      "off"
-    ],
-    "no-var": [
-      "error"
-    ],
-    "prefer-arrow-callback": [
-      "error"
-    ],
-    "prefer-const": [
-      "error"
-    ],
-    "quotes": [
-      "error",
-      "double"
-    ],
-    "semi": [
-      "error",
-      "always",
-      {
-        "omitLastInOneLineBlock": false
-      }
-    ],
-    "strict": [
-      "error",
-      "safe"
-    ]
-  }
-}
+	env: {
+		commonjs: true,
+		es6: true,
+		node: true,
+	},
+	extends: [
+		"standard",
+	],
+	parserOptions: {
+		ecmaVersion: 2018,
+		sourceType: "script",
+	},
+	rules: {
+		"comma-dangle": [
+			"error",
+			{
+				arrays: "always-multiline",
+				exports: "always-multiline",
+				functions: "never",
+				imports: "always-multiline",
+				objects: "always-multiline",
+			},
+		],
+		indent: [
+			"error",
+			"tab",
+			{
+				SwitchCase: 1,
+			},
+		],
+		"no-tabs": [
+			"off",
+		],
+		"no-var": [
+			"error",
+		],
+		"prefer-arrow-callback": [
+			"error",
+		],
+		"prefer-const": [
+			"error",
+		],
+		quotes: [
+			"error",
+			"double",
+		],
+		semi: [
+			"error",
+			"always",
+			{
+				omitLastInOneLineBlock: false,
+			},
+		],
+		strict: [
+			"error",
+			"safe",
+		],
+	},
+};

.travis.yml

@@ -13,22 +13,8 @@ cache:
     - "$HOME/.cache"
 
 install:
-  - npm install --ignore-scripts
+  - npm install
 
 script:
-  - npm run create-patch
   - npm run test
-  - npm run build
-  - npm run install
-  - ls patches && cat patches/*
-
-deploy:
-  provider: releases
-  skip_cleanup: true
-  api_key:
-    secure: Q52hIujo9j+sh7IjsICa29YNoasrnBwmBSmLOl+BWrl8Y2D333GQ71R7Gj8x5/KsClx/AzEPQM9f6yfUKdjaav1GGcidMIfHi746K6BQUPw2cGTj9zNwKJp8SEYLtwGSkxjQvrTTrdoIhKKQSSUbRk75QR5RwmfymLv6RxciUZsjcLSejJRd8EsJHWonbp4eGVpVbQhaCxmaVjmug89YpK0wcSjRZOkM4GehhpXNMQ815Ppi74r69HSw83RI2g3N40c75m+V4yKx7nNdiEVGrkNA/2n0ay/Oge4MQ0bRQukYDhHoNXiNilltE5r5S00Yoxn4Kw55/czhWgA7P4kqQ6Jf7/BpOB3FhcFDrWBVJELA/AdVdNUpw0EjA0if+k2FBBbHOPeoadCue30baQ0AIFFQncKs7q5l4CHFNsv3rYA4quuheKG6HZm2lJkH0fNdl052/pY+P0fMBLFbEc7CixDwQyEWsixqIM8OIz+NtYQHUTq1Hb5uEyuEdPRuSJqRiim/4A1cUx5QpyHE7Y1uICmDmtSlHwVsSzRV82w7Qs3FWuwWqLr1AoTHayqq80Rt4L68G2xotCn30RQZebzs9mU/ieyxTLruy+6VTQcxj1QQWAlbvghafbBfuvW1hPZokCKHuiPi8atTyfnViXFNe5RhFhFNHDWmXahu58ioob4=
-  file_glob: true
-  file: ./patches/*.patch
-  on:
-    all_branches: true
-    tags: true
+  - npm run translate

appveyor.yml

@@ -2,15 +2,6 @@ version: "{build}"
 skip_branch_with_pr: true
 build: off
 
-# Test against the latest version of this Node.js version
-environment:
-  nodejs_version: "stable"
-  matrix:
-    - gitkraken_platform: win64
-      platform: x64
-    - gitkraken_platform: win32
-      platform: x86
-
 cache:
   - node_modules
   - '%APPDATA%\npm-cache'
@@ -19,21 +10,18 @@ cache:
 # Install scripts. (runs after repo cloning)
 install:
   # Get the latest stable version of Node.js or io.js
-  - ps: Install-Product node $env:nodejs_version $env:platform
+  - ps: Install-Product node $env:nodejs_version x64
   # install modules
-  - npm install --ignore-scripts
+  - npm install
 
 build_script:
-  - npm run create-patch
+  - npm run test
+  - npm run translate
 
 artifacts:
-  - path: 'patches\*.patch'
-    name: patch
+  - path: 'strings\*.json'
+    name: locales
+
+  - path: 'package-lock.json'
+    name: package-lock
 
-deploy:
-  provider: GitHub
-  auth_token:
-    secure: 8hqStAGHShwpTpTvpJqw01bteLm0Z1Ob9MdFMevTlCJWb5iVXcr7dpOMGIaOdfSz
-  artifact: /.*\.patch/            # upload all git patch to release assets
-  on:
-    appveyor_repo_tag: true        # deploy on tag push only

src/download.js → download.js

@@ -1,10 +1,12 @@
+#!/usr/bin/env node
 "use strict";
 const fs = require("fs-extra");
 const path = require("path");
 const os = require("os");
 
 const platform = require("./platform");
 const spawn = require("./spawn");
+require("./handledRejection");
 
 const URLS = {
 	win32: `https://release.gitkraken.com/${platform}/GitKrakenSetup.exe`,
@@ -85,6 +87,7 @@ async function download () {
 	console.log(`Downloading GitKraken from ${url}`);
 	await spawn([
 		"curl",
+		"--ssl-no-revoke",
 		"--fail",
 		"--insecure",
 		"--location",
@@ -99,6 +102,9 @@ async function download () {
 	});
 
 	console.log(`Installing Gitkraken ${fileName}`);
+	if (platform !== "win32") {
+		await fs.chmod(fileName, 0o777);
+	}
 	await INSTS[process.platform](fileName);
 	await fs.unlink(fileName);
 }

getAppRoot.js

@@ -4,6 +4,7 @@ const fs = require("fs-extra");
 const path = require("path");
 const asar = require("asar");
 const os = require("os");
+require("./handledRejection");
 
 async function findRootPosix (dirs) {
 	if (process.platform !== "win32") {
@@ -102,8 +103,6 @@ async function findRoot () {
 	return findRootFn();
 }
 
-let rootPromise;
-
 async function getRootInfo (resources) {
 	const appRoot = path.join(resources, "app");
 	const pkg = await fs.readJson(path.join(appRoot, "package.json"));
@@ -123,10 +122,7 @@ function getAsarInfo (resources) {
 }
 
 module.exports = async () => {
-	if (!rootPromise) {
-		rootPromise = findRoot();
-	}
-	const originalAsar = await rootPromise;
-	assert.ok(originalAsar, "Can not find GitKraken");
-	return originalAsar;
+	const root = await findRoot();
+	assert.ok(root, "Can not find GitKraken");
+	return root;
 };

handledRejection.js

@@ -0,0 +1,7 @@
+"use strict";
+process.on("unhandledRejection", (reason) => {
+	console.error(reason);
+	if (!process.exitCode) {
+		process.exitCode = 1;
+	}
+});