Pārlūkot izejas kodu

Workaround for sourcing nvm implemented, logic moved to setup.sh

Edward Bramanti 10 gadi atpakaļ
vecāks
revīzija
427804eba1

+ 2 - 2
frameworks/JavaScript/express/app.js

@@ -9,8 +9,8 @@ var cluster = require('cluster')
   , express = require('express')
   , mongoose = require('mongoose')
   , async = require('async')
-  , conn = mongoose.connect('mongodb://localhost/hello_world')
-  , connMap = { user: 'benchmarkdbuser', password: 'benchmarkdbpass', database: 'hello_world', host: 'localhost', charset: 'utf8' };
+  , conn = mongoose.connect('mongodb://127.0.0.1/hello_world')
+  , connMap = { user: 'benchmarkdbuser', password: 'benchmarkdbpass', database: 'hello_world', host: '127.0.0.1', charset: 'utf8' };
 
 var Schema = mongoose.Schema
   , ObjectId = Schema.ObjectId;

+ 1 - 5
frameworks/JavaScript/express/install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
-fw_depends nodejs
-
-export NVM_HOME=${IROOT}/nvm
-source $NVM_HOME/nvm.sh
-nvm install 0.10.8
+fw_depends nodejs

+ 6 - 5
frameworks/JavaScript/express/setup.sh

@@ -3,16 +3,17 @@ sed -i 's|mongodb://.*/hello_world|mongodb://'"${DBHOST}"'/hello_world|g' app.js
 sed -i 's|localhost|'"${DBHOST}"'|g' app.js
 
 export NODE_ENV=production
-export NODE_HOME=${IROOT}/nvm/v0.10.8
-export PATH=$PATH:$NODE_HOME/bin
+export NVM_HOME=${IROOT}/nvm
+# Used to avoid nvm's return 2 error.
+# Sourcing this functions if 0 is returned.
+source $NVM_HOME/nvm.sh || 0
+nvm install 0.10.8
+nvm use 0.10.8
 
 # run app
 npm install
 node app &
 
-# ${NODE_HOME}/bin/npm install
-# ${NODE_HOME}/bin/node app &
-
 # !DO NOT REMOVE!
 #
 # It takes `node app` a few seconds to turn on and 

+ 1 - 5
frameworks/JavaScript/hapi/install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
-fw_depends nodejs
-
-export NVM_HOME=${IROOT}/nvm
-source $NVM_HOME/nvm.sh
-nvm install 0.11.16
+fw_depends nodejs

+ 6 - 2
frameworks/JavaScript/hapi/setup.sh

@@ -2,8 +2,12 @@
 sed -i 's|localhost|'"${DBHOST}"'|g' app.js
 
 export NODE_ENV=production
-export NODE_HOME=${IROOT}/nvm/v0.10.8
-export PATH=$PATH:$NODE_HOME/bin
+export NVM_HOME=${IROOT}/nvm
+# Used to avoid nvm's return 2 error.
+# Sourcing this functions if 0 is returned.
+source $NVM_HOME/nvm.sh || 0
+nvm install 0.10.8
+nvm use 0.10.8
 
 # run app
 npm install

+ 1 - 5
frameworks/JavaScript/koa/install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
-fw_depends nodejs
-
-export NVM_HOME=${IROOT}/nvm
-source $NVM_HOME/nvm.sh
-nvm install 0.11
+fw_depends nodejs

+ 11 - 3
frameworks/JavaScript/koa/setup.sh

@@ -2,9 +2,17 @@
 
 sed -i 's|mongodb//.*/hello_world|mongodb//'"${DBHOST}"'/hello_world|g' app.js
 
-export NODE_ENV=production
-export NODE_HOME=${IROOT}/nvm/v0.11.16
-export PATH=$PATH:$NODE_HOME/bin
+# export NODE_ENV=production
+# export PATH=$PATH:$NODE_HOME/bin
+
+
+export NVM_HOME=${IROOT}/nvm
+# Used to avoid nvm's return 2 error.
+# Sourcing this functions if 0 is returned.
+source $NVM_HOME/nvm.sh || 0
+nvm install 0.11.16
+nvm use 0.11.16
+
 
 # run app
 npm install

+ 1 - 5
frameworks/JavaScript/nodejs/install.sh

@@ -1,7 +1,3 @@
 #!/bin/bash
 
-fw_depends nodejs
-
-export NVM_HOME=${IROOT}/nvm
-source $NVM_HOME/nvm.sh
-nvm install 0.10.8
+fw_depends nodejs

+ 6 - 10
frameworks/JavaScript/nodejs/setup.sh

@@ -3,19 +3,15 @@ sed -i 's|localhost|'"${DBHOST}"'|g' hello.js
 sed -i 's|mongodb//.*/hello_world|mongodb//'"${DBHOST}"'/hello_world|g' hello.js
 
 export NODE_ENV=production
-export NODE_HOME=${IROOT}/nvm/v0.10.8
-export PATH=$PATH:$NODE_HOME/bin
+export NVM_HOME=${IROOT}/nvm
+# Used to avoid nvm's return 2 error.
+# Sourcing this functions if 0 is returned.
+source $NVM_HOME/nvm.sh || 0
+nvm install 0.10.8
+nvm use 0.10.8
 
 npm install
 node hello.js &
-# export NVM_HOME=${IROOT}/nvm
-# source $NVM_HOME/nvm.sh
-# nvm install 0.10.8
-# nvm use 0.10.8
-
-# # run app
-# npm install
-# node app &
 
 # !DO NOT REMOVE!
 #