fixes conflict

sintaxi · Apr 9, 2021 · 878d9ca · 878d9ca
2 parents 6d62288 + 4007cda
commit 878d9ca
Show file tree

Hide file tree

Showing 4 changed files with 140 additions and 85 deletions.
diff --git a/lib/middleware/deploy.js b/lib/middleware/deploy.js
@@ -76,7 +76,6 @@ module.exports = function(req, next){
     //console.log("tick", tick.toString())
 
     if (Object.keys(progress).length > 1) global.ponr = true
-
     //try {
 
       try {
@@ -251,7 +250,10 @@ module.exports = function(req, next){
             : payload.file
 
           // refresh view
-          progress[payload.id].update(payload.written / payload.total, { file: file })
+          if (!(payload.id === "cdn" && payload.end)){
+            progress[payload.id].update(payload.written / payload.total, { file: file })  
+          }
+
         } catch(e){
           //console.log(e)
         }

diff --git a/lib/middleware/util/helpers.js b/lib/middleware/util/helpers.js
@@ -1,5 +1,4 @@
-var prompt      = require('prompt')
-
+var colors      = require("colors")
 var request     = require("request")
 var localCreds  = require("./creds.js")
 var os          = require('os')