From 03ef8db11a08872b7280824bc2b030fb62fb1586 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@c9.io>
Date: Thu, 16 Apr 2015 21:31:19 +0000
Subject: [PATCH] read from simple install field in package.json

---
 plugins/c9.ide.plugins/debug.js               | 21 +++++++++++++------
 .../mock/c9.ide.example3/package.json         |  5 +----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/c9.ide.plugins/debug.js b/plugins/c9.ide.plugins/debug.js
index a8974c77..99da11a3 100644
--- a/plugins/c9.ide.plugins/debug.js
+++ b/plugins/c9.ide.plugins/debug.js
@@ -165,8 +165,8 @@ define(function(require, exports, module) {
                             
                             // Start the installer if one is included
                             if (options.installer) {
-                                addStaticPlugin("installer", name, options.installer.main,
-                                    options.installer.version, resourceHolder);
+                                addStaticPlugin("installer", name, options.installer,
+                                    null, resourceHolder);
                             }
                             
                             next();
@@ -311,11 +311,20 @@ define(function(require, exports, module) {
                     services.newresource.addFileTemplate(data, plugin);
                     break;
                 case "installer":
-                    installer.createSession(pluginName, data, function(v, o){
-                        require([path], function(fn){
-                            fn(v, o);
+                    if (data) {
+                        installer.createSession(pluginName, data, function(v, o){
+                            require([path], function(fn){
+                                fn(v, o);
+                            });
                         });
-                    });
+                    }
+                    else {
+                        require([path], function(fn){
+                            installer.createSession(pluginName, fn.version, function(v, o){
+                                fn(v, o);
+                            });
+                        });
+                    }
             }
         }
         
diff --git a/plugins/c9.ide.plugins/mock/c9.ide.example3/package.json b/plugins/c9.ide.plugins/mock/c9.ide.example3/package.json
index 4560bfb3..f2e46dca 100644
--- a/plugins/c9.ide.plugins/mock/c9.ide.example3/package.json
+++ b/plugins/c9.ide.plugins/mock/c9.ide.example3/package.json
@@ -16,10 +16,7 @@
   "plugins": {
     "example": {}
   },
-  "installer": {
-    "main": "install.js",
-    "version": 1
-  },
+  "installer": "install.js",
   "categories": [
     "misc"
   ],