From cd697d72056d273ddd88f27e0d2a35acc56c55f8 Mon Sep 17 00:00:00 2001 From: Benedict Aas Date: Sat, 24 Mar 2018 00:54:48 +0000 Subject: [PATCH] fix: use correct usbbot blob path in appimages We use the `app.asar` relative path to read the usbboot blob files instead of relative to the normal project root. Change-Type: patch Changelog-Entry: Use correct usbboot blob path in AppImages. --- lib/gui/app/modules/drive-scanner.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/gui/app/modules/drive-scanner.js b/lib/gui/app/modules/drive-scanner.js index df72113c..929e34fc 100644 --- a/lib/gui/app/modules/drive-scanner.js +++ b/lib/gui/app/modules/drive-scanner.js @@ -23,13 +23,16 @@ const path = require('path') const settings = require('../models/settings') const SDK = require('../../../sdk') const permissions = require('../../../shared/permissions') +const packageJSON = require('../../../../package.json') /** * @summary The Etcher "blobs" directory path * @type {String} * @constant */ -const BLOBS_DIRECTORY = path.join(__dirname, '..', '..', '..', 'blobs') +const BLOBS_DIRECTORY = packageJSON.packageType === 'AppImage' + ? 'bin/resources/app.asar/lib/blobs' + : path.join(__dirname, '..', '..', '..', 'blobs') const scanner = SDK.createScanner({ blockdevice: {