fix: Cleanup fail after build

develar · develar · commit 2e35205adf3f · 2016-09-07T20:03:57.000+02:00
Probably it is a fix Closes #724
diff --git a/src/util/tmp.ts b/src/util/tmp.ts
@@ -50,21 +50,23 @@ export class TmpDir {
     }
 
     return this.tempDirectoryPromise
-      .then(it => path.join(it, `temp-${(this.tmpFileCounter++).toString(16)}${suffix.startsWith(".") ? suffix : `-${suffix}`}`))
+      .then(it => path.join(it, `t-${process.pid.toString(16)}-${(this.tmpFileCounter++).toString(16)}${suffix.startsWith(".") ? suffix : `-${suffix}`}`))
   }
 
   cleanup(): Promise<any> {
-    if (this.dir == null) {
+    const dir = this.dir
+    if (dir == null) {
       return BluebirdPromise.resolve()
     }
 
-    return remove(this.dir)
-      .then(() => {
-        this.dir = null
-      })
+    this.dir = null
+    return remove(dir)
       .catch(e => {
-        if (e.code !== "EPERM") {
-          warn(`Cannot delete temporary dir "${this.dir}": ${(e.stack || e).toString()}`)
+        if (e.code === "EPERM") {
+          this.dir = dir
+        }
+        else {
+          warn(`Cannot delete temporary dir "${dir}": ${(e.stack || e).toString()}`)
         }
       })
   }

Original file line number	Diff line number	Diff line change
`@@ -50,21 +50,23 @@ export class TmpDir {`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`return this.tempDirectoryPromise`
`53`		- .then(it => path.join(it, `temp-${(this.tmpFileCounter++).toString(16)}${suffix.startsWith(".") ? suffix : `-${suffix}`}`))
	`53`	+ .then(it => path.join(it, `t-${process.pid.toString(16)}-${(this.tmpFileCounter++).toString(16)}${suffix.startsWith(".") ? suffix : `-${suffix}`}`))
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`cleanup(): Promise<any> {`
`57`		`- if (this.dir == null) {`
	`57`	`+ const dir = this.dir`
	`58`	`+ if (dir == null) {`
`58`	`59`	`return BluebirdPromise.resolve()`
`59`	`60`	`}`
`60`	`61`
`61`		`- return remove(this.dir)`
`62`		`- .then(() => {`
`63`		`- this.dir = null`
`64`		`- })`
	`62`	`+ this.dir = null`
	`63`	`+ return remove(dir)`
`65`	`64`	`.catch(e => {`
`66`		`- if (e.code !== "EPERM") {`
`67`		- warn(`Cannot delete temporary dir "${this.dir}": ${(e.stack \|\| e).toString()}`)
	`65`	`+ if (e.code === "EPERM") {`
	`66`	`+ this.dir = dir`
	`67`	`+ }`
	`68`	`+ else {`
	`69`	+ warn(`Cannot delete temporary dir "${dir}": ${(e.stack \|\| e).toString()}`)
`68`	`70`	`}`
`69`	`71`	`})`
`70`	`72`	`}`