Merge pull request #2214 from resin-io/fix-usbboot-macos

fix(drive-scanner): Fix usbboot blob path when bundled
This commit is contained in:
Jonas Hermsmeier 2018-04-18 22:48:25 +02:00 committed by GitHub
commit c5df8742c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -30,9 +30,14 @@ const packageJSON = require('../../../../package.json')
* @type {String}
* @constant
*/
const BLOBS_DIRECTORY = packageJSON.packageType === 'AppImage'
? 'bin/resources/app.asar/lib/blobs'
: path.join(__dirname, '..', '..', '..', 'blobs')
let BLOBS_DIRECTORY = path.join(__dirname, '..', '..', '..', 'blobs')
// FIXME: When bundled & packaged, the blob path differs
if (packageJSON.packageType !== 'local') {
BLOBS_DIRECTORY = packageJSON.packageType === 'AppImage'
? 'bin/resources/app.asar/lib/blobs'
: path.join(__dirname, '..', '..', 'blobs')
}
const scanner = SDK.createScanner({
blockdevice: {