Merge pull request #25 from leonhartX/fix-order

Fix order
leonhartX · Jul 5, 2017 · 11ad6d1 · 11ad6d1
2 parents 9e662a3 + 6e3888c
commit 11ad6d1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/manifest.json b/manifest.json
@@ -1,5 +1,5 @@
 {
-  "version": "2.0.1",
+  "version": "2.0.2",
   "manifest_version": 2,
   "default_locale": "en",
   "name": "__MSG_appName__",

diff --git a/src/gas-api.js b/src/gas-api.js
@@ -13,12 +13,12 @@ function pull(code) {
     const type = match[2];
 
     if (!code.gas[file]) {
-      return gasCreateFile(name, type)
+      return () => gasCreateFile(name, type)
       .then(() => {
         return gasUpdateFile(name, code.github[file]);
       })
     } else {
-      return gasUpdateFile(name, code.github[file]);
+      return () => gasUpdateFile(name, code.github[file]);
     }
   });
 
@@ -30,7 +30,7 @@ function pull(code) {
       return;
     }
     const name = match[1];
-    return gasDeleteFile(name);
+    return () => gasDeleteFile(name);
   });
 
   if (update_promises.length === 0 && delete_promises.length === 0) {
@@ -40,9 +40,9 @@ function pull(code) {
 
   getGasContext()
   .then(() => {
-    return Promise.all(update_promises)
+    return Promise.all(update_promises.map(f => f()))
     .then(() => {
-      return Promise.all(delete_promises);
+      return Promise.all(delete_promises.map(f => f()));
     })
   })
   .then(() => {