This commit is contained in:
Shane Harris
2020-08-17 13:31:48 +01:00
committed by Your Name
parent 270d76ee39
commit 34caadf3b5
3 changed files with 18 additions and 15 deletions
Binary file not shown.
+1 -1
View File
@@ -347,7 +347,7 @@ export class AdbClientService {
}
async setupAdb() {
if (!this.isAdbDownloaded()) {
this.appService.seedPlatformTools();
await this.appService.seedPlatformTools();
}
this.appService.electron.ipcRenderer.on('adb-command', (event, arg: any) => {
if (this.adbResolves[arg.uuid]) {
+17 -14
View File
@@ -226,22 +226,25 @@ export class AppService {
}
}
seedPlatformTools() {
if (!this.fs.existsSync(this.path.join(this.appData, 'platform-tools'))) {
let sourcesPath = this.path.join(__dirname, '..', 'platform-tools');
if (!this.fs.existsSync(sourcesPath)) {
sourcesPath = this.path.join(process.cwd(), 'build', 'platform-tools');
}
console.log(this.path.join(__dirname, '..', 'platform-tools'), process.cwd(), __dirname);
this.fs.mkdir(this.path.join(this.appData, 'platform-tools'), () => {
this.fs.readdir(sourcesPath, (err, files) => {
files.forEach(file => {
this.fs
.createReadStream(this.path.join(sourcesPath, file))
.pipe(this.fs.createWriteStream(this.path.join(this.appData, 'platform-tools', file)));
return new Promise(resolve => {
if (!this.fs.existsSync(this.path.join(this.appData, 'platform-tools'))) {
let sourcesPath = this.path.join(__dirname, '..', 'platform-tools');
if (!this.fs.existsSync(sourcesPath)) {
sourcesPath = this.path.join(process.cwd(), 'build', 'platform-tools');
}
console.log(this.path.join(__dirname, '..', 'platform-tools'), process.cwd(), __dirname);
this.fs.mkdir(this.path.join(this.appData, 'platform-tools'), () => {
this.fs.readdir(sourcesPath, (err, files) => {
files.forEach(file => {
this.fs
.createReadStream(this.path.join(sourcesPath, file))
.pipe(this.fs.createWriteStream(this.path.join(this.appData, 'platform-tools', file)));
});
setTimeout(() => resolve(), 5000);
});
});
});
}
}
});
}
makeFolders() {
return this.mkdir(this.appData)