feat(nsis): display required disk space

Adjusted code style, changed operations order in packArch electron-userland#7487
inickvel · Apr 17, 2023 · da837a8 · da837a8
1 parent c830d33
commit da837a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/packages/app-builder-lib/src/targets/nsis/nsisUtil.ts b/packages/app-builder-lib/src/targets/nsis/nsisUtil.ts
@@ -59,13 +59,11 @@ export class AppPackageHelper {
       const appOutDir = target.archs.get(arch)!
       resultPromise = this.elevateHelper
         .copy(appOutDir, target)
-        .then(() => dirSize(appOutDir))
-        .then(unpackedSize =>
-          target.buildAppPackage(appOutDir, arch).then(fileInfo => ({
-            fileInfo,
-            unpackedSize,
-          }))
-        )
+        .then(() => target.buildAppPackage(appOutDir, arch))
+        .then(async fileInfo => ({
+          fileInfo,
+          unpackedSize: await dirSize(appOutDir),
+        }))
       this.archToResult.set(arch, resultPromise)
     }
 

diff --git a/packages/builder-util/src/fs.ts b/packages/builder-util/src/fs.ts
@@ -312,7 +312,9 @@ export async function dirSize(dirPath: string): Promise<number> {
   const entrySizes = entries.map(async entry => {
     const entryPath = path.join(dirPath, entry.name)
 
-    if (entry.isDirectory()) return await dirSize(entryPath)
+    if (entry.isDirectory()) {
+      return await dirSize(entryPath)
+    }
 
     if (entry.isFile()) {
       const { size } = await stat(entryPath)