fix

ethereum · Feb 24, 2017 · 52a78b3 · 52a78b3
1 parent ec3a5d3
commit 52a78b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/gulpTasks/building.js b/gulpTasks/building.js
@@ -60,31 +60,33 @@ gulp.task('switch-production', (cb) => {
 
 
 gulp.task('bundling-interface', (cb) => {
-    if (type === 'mist') {
-        exec(`cd interface && meteor-build-client ../dist_${type}/app/interface -p ""`, (err, stdout) => {
+    const bundle = (additionalCommands) => {
+        exec(`cd interface;
+            meteor-build-client ../dist_${type}/app/interface -p "";
+            ${additionalCommands || ''}`,
+        (err, stdout) => {
             console.log(stdout);
-
             cb(err);
         });
+    };
+
+    if (type === 'mist') {
+        bundle();
     }
 
     if (type === 'wallet') {
         if (options.walletSource === 'local') {
             console.log('Use local wallet at ../meteor-dapp-wallet/app');
-            exec(`cd interface/ && meteor-build-client ../dist_${type}/app/interface/ -p "" &&` +
-                `cd ../../meteor-dapp-wallet/app && meteor-build-client ../../mist/dist_${type}/app/interface/wallet -p ""`, (err, stdout) => {
-                console.log(stdout);
-
-                cb(err);
-            });
+            bundle(`cd ../../meteor-dapp-wallet/app;
+                meteor-build-client ../../mist/dist_${type}/app/interface/wallet -p ""`);
         } else {
             console.log(`Pulling https://github.com/ethereum/meteor-dapp-wallet/tree/${options.walletSource} "${options.walletSource}" branch...`);
-            exec(`cd interface/ && meteor-build-client ../dist_${type}/app/interface/ -p "" &&` +
-                `cd ../dist_${type}/ && git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git && cd meteor-dapp-wallet/app && meteor-build-client ../../app/interface/wallet -p "" && cd ../../ && rm -rf meteor-dapp-wallet`, (err, stdout) => {
-                console.log(stdout);
-
-                cb(err);
-            });
+            bundle(`cd ../dist_${type};
+                git clone --depth 1 https://github.com/ethereum/meteor-dapp-wallet.git;
+                cd meteor-dapp-wallet/app;
+                meteor-build-client ../../app/interface/wallet -p "";
+                cd ../../;
+                rm -rf meteor-dapp-wallet`);
         }
     }
 });
@@ -115,7 +117,6 @@ gulp.task('build-dist', (cb) => {
                 buildResources: '../build',
                 output: '../dist',
             },
-            npmRebuild: false,  // TODO remove
             linux: {
                 target: [
                     'zip',

diff --git a/gulpfile.js b/gulpfile.js
@@ -38,7 +38,7 @@ if (_.isEmpty(_.intersection(args, ['--mac', '--linux', '--win']))) {
 }
 
 
-// prepare global variables
+// prepare global variables (shared with other gulp task files)
 options.type = (options.wallet) ? 'wallet' : 'mist';
 options.platforms = platforms;
 options.activePlatforms = _.keys(_.pick(_.pick(options, platforms), (key) => { return key; }));

diff --git a/package.json b/package.json
@@ -12,7 +12,6 @@
   },
   "main": "main.js",
   "dependencies": {
-    "babel-runtime": "^6.22.0",
     "bignumber.js": "^4.0.0",
     "bluebird": "^3.4.7",
     "chai-as-promised": "^6.0.0",