Permalink
Browse files

GPII-50 Fixing linux build

Merge remote-tracking branch 'kaspermarkus/GPII-50'

* kaspermarkus/GPII-50:
  GPII-50: removed unused global __dirname declaration
  GPII-50: updated gpii.js to match windows version.. Readded start.sh, but without the build command being part of it (this was a bit akward to the the root requirement
  • Loading branch information...
2 parents f1a0ad0 + b7720f5 commit 32baeb08f552faa3d6012c16fcce4cb56234d98c @sgithens sgithens committed Nov 16, 2012
Showing with 18 additions and 2 deletions.
  1. +2 −2 gpii.js
  2. +16 −0 start.sh
View
@@ -16,6 +16,6 @@ var fluid = require("universal"),
fluid.require("gsettingsBridge", require);
gpii.config.makeConfigLoader({
- nodeEnv: gpii.config.getNodeEnv(),
- configPath: gpii.config.getConfigPath() || "../node_modules/universal/gpii/node_modules/flowManager/configs"
+ nodeEnv: gpii.config.getNodeEnv("fm.ps.sr.dr.mm.os.development"),
+ configPath: gpii.config.getConfigPath() || "../node_modules/universal/gpii/configs"
});
View
@@ -0,0 +1,16 @@
+#!/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"
+
+# Start the Flow Manager
+node "$fileName" $1

0 comments on commit 32baeb0

Please sign in to comment.