From 91eaf4dc1c760acd6b65bfbdb5dc3cd8c88aa245 Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Tue, 21 Apr 2020 22:31:19 +0100 Subject: [PATCH] added executable bit to adb --- build-electron/app.jsc | Bin 62344 -> 62344 bytes desktop-app/src/app/app.service.ts | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index 9f6924bdd8c461865a207f8ee1c190348e7ceed3..c8c5a096fc11e92053e82b28715301ad93c793bb 100644 GIT binary patch delta 4138 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 M8#j=Td%U^-1FXL;%>V!Z delta 4138 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 Dj|4?x diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 08ea5d2..7fa9f53 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -240,6 +240,11 @@ export class AppService { .createReadStream(this.path.join(sourcesPath, file)) .pipe(this.fs.createWriteStream(this.path.join(this.appData, 'platform-tools', file))); }); + if (this.os.platform() === 'darwin' || this.os.platform() === 'linux') { + this.setExecutable(this.path.join(this.appData, 'platform-tools', 'adb')).then(() => resolve()); + } else { + return resolve(); + } setTimeout(() => resolve(), 5000); }); });