From 21b6fca8b9496f00765118b1267d0ae82f0dbebb Mon Sep 17 00:00:00 2001 From: Shane Harris Date: Tue, 21 Apr 2020 22:51:40 +0100 Subject: [PATCH] latest --- build-electron/app.jsc | Bin 62344 -> 62344 bytes desktop-app/src/app/app.service.ts | 34 ++++++++++++++++------------- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/build-electron/app.jsc b/build-electron/app.jsc index a2c8da509a96fa882a5087e24915e32d1a7e974e..019a1bed8acb3cd5660fdcf9f0df64fbf1fb4059 100644 GIT binary patch delta 4138 zcmY)x3s@B8w%I)(0xF`y-XxkuAVee~L3xOZuq4WYn2(DIEwISyvaGuc3K94U$q<8+ zXppF=c=L6MUr|U@P%$;JNV$qvP*QmqQk0uw!JU6_$UEP+v**ltKmVDWc5zO-_%qgw zx!FHJ8r?VNyEH;wu_iRXKNn*2Z8u>a!@AV3du`HdFE0!3KPF~{Qlr!<49PnFsc3Be z`9mS+4cNr6S;xNg@e`QMIAD!R6Q8^$#zSP4Ul*C`d{LkQ2WSwctxyQNyD>wnz0tW#q0;KKQ@#IOkxh09Tdo;)XK=a z+1>(;_aIr5pjt7QpGxu71c5f30~A{A5i5b#Wvjay7Y*u{qKGC_=bq)&;}8@Pf{ z_G6cFZsM;dEcpJ{q!-7T`hn=gwfp#I}l)Z2)c2({Ky@@^1r=9m_%eHRE!v=oL!m43Ev1+V)` zT|y1HWTp{8!SMH2qK^d&0hz1SxZFYl?&q4GW17VQc%%}qAr6*G6A1h%_BMVx+HR?H z&fD37PHH&jB|`nZ(vdP$RZ0`8KxrG!&3AZJF6|Y$mh3ejb z_2O~=w=Cr0LBTP>^2L-^uxpb)`OP^+3|ExRe-O2+B?Hz!d=Z8jlO&Km@#!qwIjIPG z-wdth{I$g}w~t`M>{btKa7zT4bkYF&PG+I*q;xe#PiEP4vzrfI^&%70#ylV?KT!SVZWhPy8`w70e3haAxK z$>U?B%H7Tcdf)nT8oB*Ww`ggCFY||Bm}Wgp*r!~G4OUNv%4WjRbjd0F4ASsNzR|y5 zkfUi!QfYXU($4rwllIw9W8g`T`#N-(eiE8%JgV^SbO{`Ds@sImr^kc){4YCE;UkB1 zCvz7hK0zS*`dc}^@Rpl zgvMYW$NIiGLt{yIrAia0PKj5(W^N^QqRO@`vhOAfWp#|W;O226dG{^@u8Py%_2KxOO@|o_~Wic8^;wI7my$oe4@s(%`sy5A^3_YnX%$ z%?l|OnE2t08O#}79G?3&*GGneW{3ScydF6nB5n8f6N`o4n1b_z;ceu~KTiNe`|l3I zjnT6p&n)FOxfE?DW{WxtVA zz`T)5Nl?lMV(}Ka0S~U72KB{JW!SdXi*i>Gi}nh`42 zxqprx=`7g)Yhoc;ls?7;jN2dNpgKzeEy_d-%*kS*K4;WEJd(8l3NEZXOPF;QTtVDt zK1ZwdGa-HYO<%HbeY7crelNO%CpK>aQH(@GX5@S%0&A6Z8acD&q&d9af8Gw$wzDAH zE}DzGwmY&F#v7Mu6!fCWrmtv=BIomi-eggB6Yp<#1Eaim5sofo+1}#nTRbaw<7bKE zrs2@F;E)x+8y6J1L6@g`7OpS6&Su_vG*{rJ8B5m0ae;H8b4`_3QH_G|#id@x?A+ z45>JRA;lq3B9&~%g5pJQzI)gxD5A0Hlv=fdbAc+l(q5cSOuv*dU`&j8h7r5EAlBuc zDF&3d!0W*ut|lu>{$yBV#LrJ()u31E^{QkIuOapRzUVq4|jmts#UKgSj_=-5z}h1rIbt8qL|HSzHb)vpKWbN`92mhqs!-`Zr?+wSo_2am+gNCii~f) zg9ZB=Vdar+8%W{-FolML7jjX1SOTSn5s@VKa2NyCrkerp9+~P`X<+vYp3p7Az4!7c zzrr|gjLR|t(Cerl6j}cI6B>@PY+J^)2ZF?4iS*o;3Rfa-sPfugc#z{q$8xjVaeX6x zcPs)5=euPR_TM8IsO*k7jUMG(`ICMMz_9WV=(93$#GU1KP$J)UkDMxZWT3etI0^54 z-3%2WVsCP$!jyr=VYkZhTQUc#gAFTi)N$?{k7xy)bo??DC?_)b?D!n0I6#VU=84;o z=h6NX+Evbj`rfBmxT?|%63iv`xWDolJPFC4hI>v%gT3eCQ$%!1#DM)Kb^y()Vxg~2 zpGP!RTyOQ3*K8%HsvQ`p$KVKT`6dyneZFwR(9w#mfOT{zRiplQFNhXkKGvgFmU5|rm#j>Zk=6V1G zhyx#xs_O+@EYBnk7~U8MHfwVBVrAn>Fz$)&LB}5hr5he+4IOo~V|7YB-zdDfrm5Vr z+5BTWB!msCC%PLC0D3JyZp5hDc5E~|^v%I99mL+;Y)L-pR05QWt9Fv!?mZ01@>9lRVb4@>y_9Q58hXYs zBl_Gw8Co`Dad(fcB`pc9fOqbl-^u7-of)>S@!@m&lwLG*p$o(16sBBf-k%ymmh^fs F{{ub!L>>SD delta 4138 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 diff --git a/desktop-app/src/app/app.service.ts b/desktop-app/src/app/app.service.ts index 07b20a5..32cba5d 100644 --- a/desktop-app/src/app/app.service.ts +++ b/desktop-app/src/app/app.service.ts @@ -226,27 +226,28 @@ export class AppService { } } seedPlatformTools() { - return new Promise(resolve => { + return new Promise(async 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))); - }); - if (this.os.platform() === 'darwin' || this.os.platform() === 'linux') { - this.setExecutable(this.path.join(this.appData, 'platform-tools', 'adb')).then(() => resolve()); - } else { - return resolve(); - } + // console.log(this.path.join(__dirname, '..', 'platform-tools'), process.cwd(), __dirname); + await this.mkdir(this.path.join(this.appData, 'platform-tools')); + try { + let files = this.fs.readdirSync(sourcesPath); + files.forEach(file => { + this.fs + .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') { + console.log(this.path.join(this.appData, 'platform-tools', 'adb')); + this.setExecutable(this.path.join(this.appData, 'platform-tools', 'adb')).then(() => resolve()); + } else { + return resolve(); + } + } catch (e) {} } }); } @@ -264,6 +265,9 @@ export class AppService { setExecutable(path) { return new Promise(resolve => { const ls = this.spawn('chmod', ['+x', path]); + ls.stdout.on('data', res => { + console.log(res); + }); ls.on('close', code => { resolve(); });