diff --git a/dist/tasks/checksTask.js b/dist/tasks/checksTask.js index 8afa1c2..13802f2 100644 --- a/dist/tasks/checksTask.js +++ b/dist/tasks/checksTask.js @@ -124,7 +124,7 @@ class ChecksTask { if (fs.existsSync(config.customConfig.sshKeyLocation)) { return true; } - throw new Error(`SSH key ${config.customConfig.sshKeyLocation} does not exist. This can be configured in config/settings.json`); + throw new Error(`SSH key ${config.customConfig.sshKeyLocation} does not exist. This can be configured in config/settings.json or per user in config/databases/production.json or staging.json`); }) }); }); diff --git a/dist/tasks/checksTask.js.map b/dist/tasks/checksTask.js.map index 0dd7459..1c53d91 100644 --- a/dist/tasks/checksTask.js.map +++ b/dist/tasks/checksTask.js.map @@ -1 +1 @@ -{"version":3,"file":"checksTask.js","sourceRoot":"","sources":["../../src/tasks/checksTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"checksTask.js","sourceRoot":"","sources":["../../src/tasks/checksTask.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 849f416..ca39bc2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "mage-db-sync", - "version": "1.3.7", + "version": "1.3.8", "lockfileVersion": 2, "requires": true, "packages": { diff --git a/package.json b/package.json index 1905ac9..28f4ba3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "mage-db-sync", - "version": "1.3.7", + "version": "1.3.8", "description": "Database synchronizer for Magento, based on Magerun", "author": { "name": "Jelle Siderius" diff --git a/src/tasks/checksTask.ts b/src/tasks/checksTask.ts index a51ba4d..13a01cd 100644 --- a/src/tasks/checksTask.ts +++ b/src/tasks/checksTask.ts @@ -165,7 +165,7 @@ class ChecksTask { return true; } - throw new Error(`SSH key ${config.customConfig.sshKeyLocation} does not exist. This can be configured in config/settings.json`); + throw new Error(`SSH key ${config.customConfig.sshKeyLocation} does not exist. This can be configured in config/settings.json or per user in config/databases/production.json or staging.json`); } } );