Skip to content
Browse files

Merge remote-tracking branch 'yzen/GPII-30'

* yzen/GPII-30:
  GPII-30: fixing a type in gpii.js
  GPII-30: Updating gpii.js and removing start.sh
  GPII-30: Updated the way the flowManager is started from the linux repo
  • Loading branch information...
2 parents 7a9a968 + e98ccdc commit f1a0ad066783109025356cbaa1504421fedcb2f3 @amb26 amb26 committed
Showing with 4 additions and 20 deletions.
  1. +4 −1 gpii.js
  2. +0 −19 start.sh
View
5 gpii.js
@@ -15,4 +15,7 @@ var fluid = require("universal"),
fluid.require("gsettingsBridge", require);
-gpii.flowManager();
+gpii.config.makeConfigLoader({
+ nodeEnv: gpii.config.getNodeEnv(),
+ configPath: gpii.config.getConfigPath() || "../node_modules/universal/gpii/node_modules/flowManager/configs"
+});
View
19 start.sh
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-# GPII Linux Startup Script
-#
-# Copyright 2012 OCAD University
-#
-# Licensed under the New BSD license. You may not use this file except in
-# compliance with this License.
-#
-# You may obtain a copy of the License at
-# https://github.com/gpii/universal/LICENSE.txt
-
-fileName="gpii.js"
-
-# Build and install the GPII
-./build.sh
-
-# Start the Flow Manager
-node "$fileName"

0 comments on commit f1a0ad0

Please sign in to comment.
Something went wrong with that request. Please try again.