Use go-ipfs-dep @ floodsub-0

Gruntfile.js

@@ -22,6 +22,11 @@ module.exports = function (grunt) {
         'node_modules/ipfsd-ctl/node_modules/go-ipfs-dep',
         'node_modules/ipfsd-ctl/node_modules/ipfs-api'
       ],
+      npm_build: [
+        path.join(moduleCacheDirectory, 'node_modules/ipfs/node_modules/ipfs-api@0.4.1'),
+        path.join(moduleCacheDirectory, 'node_modules/ipfsd-ctl/node_modules/go-ipfs-dep'),
+        path.join(moduleCacheDirectory, 'node_modules/ipfsd-ctl/node_modules/ipfs-api')
+      ],
       electron: [
         'Orbit-darwin-x64/',
         'Orbit-linux-x64/'
@@ -75,15 +80,6 @@ module.exports = function (grunt) {
           }
         ]
       },
-      ipfsbin: {
-        files: [
-          {
-            expand: true,
-            src: './node_modules/go-ipfs-dep/go-ipfs/ipfs',
-            dest: path.join(moduleCacheDirectory, 'node_modules/go-ipfs-dep/go-ipfs/ipfs')
-          }
-        ]
-      }
     },
 
     chmod: {
@@ -118,9 +114,9 @@ module.exports = function (grunt) {
 
     if(!skipNpmInstall) {
       grunt.task.run('npm_install')
-      grunt.task.run('copy:ipfsbin')
     }
 
+    grunt.task.run('clean:npm_build')
     grunt.task.run('chmod:bins')
     grunt.task.run('electron:osxBuild')
     grunt.task.run('clean:electron')
@@ -132,9 +128,9 @@ module.exports = function (grunt) {
 
     if(!skipNpmInstall) {
       grunt.task.run('npm_install')
-      grunt.task.run('copy:ipfsbin')
     }
 
+    grunt.task.run('clean:npm_build')
     grunt.task.run('chmod:bins')
     grunt.task.run('electron:linuxBuild')
     grunt.task.run('clean:electron')

README.md

@@ -2,15 +2,6 @@
 
 ***WIP branch for ipfs pubsub version***
 
-## Extra Requirements
-
-You need to have go-ipfs binary built from the IPFS pubsub branch https://github.com/ipfs/go-ipfs/tree/feat/floodsub. You need to have the daemon running before starting Orbit (at port 5001).
-
-You can build it manually or run the following *after* all `npm install` commands (before starting Orbit):
-```
-npm run build:goipfs
-```
-
 ## Run
 
 Currently only the Electron app works.
@@ -20,7 +11,7 @@ Currently only the Electron app works.
 - Node.js v6.x.x
 - npm v3.x.x
 - g++, gcc, make (for building native modules)
-- python 2 (for building, some native modules need it, node-fibers perhaps?)
+- python 2 (for building, some native modules need it)
 
 #### Get the source code
 
@@ -63,6 +54,13 @@ npm run build
 
 The application executable is in `bin/`.
 
+If you end building the app multiple times without changes to the modules, run:
+```
+grunt build --cached-modules
+```
+
+This will skip the `npm install` step in the build process.
+
 ### Publish
 
 *Run this is in project's root directory, not in `client/`.*
@@ -71,6 +69,7 @@ First, clone the repo then run the following commands. This will build the proje
 
 ```sh
 npm install
+npm run build
 npm run publish
 ```
 

package.json

@@ -6,7 +6,7 @@
   "dependencies": {
     "bs58": "^3.0.0",
     "du": "^0.1.0",
-    "go-ipfs-dep": "0.4.2-1",
+    "go-ipfs-dep": "https://github.com/haadcode/go-ipfs-dep.git",
     "ipfs-api": "https://github.com/haadcode/js-ipfs-api.git",
     "ipfs-post": "^0.0.12",
     "ipfsd-ctl": "^0.14.0",
@@ -34,7 +34,7 @@
     "postinstall": "./node_modules/.bin/grunt clean:npm",
     "test": "./node_modules/.bin/mocha",
     "build": "./node_modules/.bin/grunt build",
-    "dist": "npm run build && ./scripts/build_dist_package.sh",
+    "dist": "./scripts/build_dist_package.sh",
     "publish": "npm run dist && ipfs add bin/orbit-darwin-x64.tar.gz",
     "dev:electron": "ENV=dev API_ORIGIN=* IPFS_EXEC=/$GOPATH/bin/ipfs ./node_modules/.bin/electron .",
     "electron": "./node_modules/.bin/electron .",