Merge pull request #1046 from hamiltont/js-cleanup

JavaScript: Fix all

frameworks/JavaScript/express/benchmark_config

@@ -11,7 +11,7 @@
       "framework": "express",
       "language": "JavaScript",
       "orm": "Full",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -31,7 +31,7 @@
       "framework": "express",
       "language": "JavaScript",
       "orm": "Full",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -52,7 +52,7 @@
       "framework": "express",
       "language": "JavaScript",
       "orm": "Full",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/JavaScript/hapi/benchmark_config

@@ -11,7 +11,7 @@
       "framework": "hapi",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -31,7 +31,7 @@
       "framework": "hapi",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -52,7 +52,7 @@
       "framework": "hapi",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/JavaScript/nodejs/benchmark_config

@@ -12,7 +12,7 @@
       "framework": "nodejs",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -31,7 +31,7 @@
       "framework": "nodejs",
       "language": "JavaScript",
       "orm": "Full",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -51,7 +51,7 @@
       "framework": "nodejs",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -70,7 +70,7 @@
       "framework": "nodejs",
       "language": "JavaScript",
       "orm": "Full",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
@@ -90,7 +90,7 @@
       "framework": "nodejs",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "Node.js",
+      "platform": "nodejs",
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",

frameworks/JavaScript/ringojs-convenient/benchmark_config

@@ -16,7 +16,7 @@
       "framework": "ringo",
       "language": "JavaScript",
       "orm": "Micro",
-      "platform": "RingoJs",
+      "platform": "ringojs",
       "webserver": "Jetty",
       "os": "Linux",
       "database_os": "Linux",

frameworks/JavaScript/ringojs-convenient/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends ringojs
+fw_depends java ringojs

frameworks/JavaScript/ringojs/benchmark_config

@@ -12,7 +12,7 @@
       "framework": "ringo",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "RingoJs",
+      "platform": "ringojs",
       "webserver": "Jetty",
       "os": "Linux",
       "database_os": "Linux",
@@ -33,7 +33,7 @@
       "framework": "ringo",
       "language": "JavaScript",
       "orm": "Raw",
-      "platform": "RingoJs",
+      "platform": "ringojs",
       "webserver": "Jetty",
       "os": "Linux",
       "database_os": "Linux",

frameworks/JavaScript/ringojs/install.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-fw_depends ringojs
+fw_depends java ringojs

toolset/setup/linux/languages/ringojs.sh

@@ -1,10 +1,12 @@
 #!/bin/bash
 
-RETCODE=$(fw_exists /usr/share/ringojs)
+RETCODE=$(fw_exists ringo.installed)
 [ ! "$RETCODE" == 0 ] || { return 0; }
 
 fw_get http://www.ringojs.org/downloads/ringojs_0.10-1_all.deb
 sudo apt-get install -y jsvc
 sudo dpkg -i ringojs_0.10-1_all.deb
 
-rm ringojs_0.10-1_all.deb
+rm -f ringojs_0.10-1_all.deb
+
+touch $IROOT/ringo.installed