From 94f71837e76c1bf4195a8c0ef055d0fa8d283240 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 26 Sep 2017 13:57:47 +0200
Subject: [PATCH] deploy script is platform independent
---
.idea/dictionaries/gawi.xml | 7 +++++++
frontend-js/package.json | 2 +-
frontend-js/scripts/clean.js | 12 ++----------
frontend-js/scripts/deploy.js | 6 ++++++
4 files changed, 16 insertions(+), 11 deletions(-)
create mode 100644 .idea/dictionaries/gawi.xml
create mode 100644 frontend-js/scripts/deploy.js
diff --git a/.idea/dictionaries/gawi.xml b/.idea/dictionaries/gawi.xml
new file mode 100644
index 0000000000..d586f913d6
--- /dev/null
+++ b/.idea/dictionaries/gawi.xml
@@ -0,0 +1,7 @@
+<component name="ProjectDictionaryState">
+ <dictionary name="gawi">
+ <words>
+ <w>mkdirp</w>
+ </words>
+ </dictionary>
+</component>
\ No newline at end of file
diff --git a/frontend-js/package.json b/frontend-js/package.json
index 5473b919e3..dbf87572a8 100644
--- a/frontend-js/package.json
+++ b/frontend-js/package.json
@@ -10,7 +10,7 @@
"build-deploy": "npm run build && npm run deploy",
"build": "npm run clean && npm run build:css && npm run build:js",
"clean": "node scripts/clean.js",
- "deploy": "copy /Y \"dist\\*.js*\" \"C:/Program Files/apache-tomcat-7.0.72/webapps/minerva/resources/js\" && copy /Y \"dist\\*.css\" \"C:/Program Files/apache-tomcat-7.0.72/webapps/minerva/resources/css\" ",
+ "deploy": "node scripts/deploy.js",
"lint": "jshint src/.",
"test": "istanbul cover node_modules/mocha/bin/_mocha -- --recursive src/test/js"
},
diff --git a/frontend-js/scripts/clean.js b/frontend-js/scripts/clean.js
index 1822779c31..f319946559 100644
--- a/frontend-js/scripts/clean.js
+++ b/frontend-js/scripts/clean.js
@@ -2,14 +2,6 @@ var del = require('del');
var mkdirp = require('mkdirp');
-var exec = require('child_process').exec;
-function puts(error, stdout, stderr) { console.log(stdout) }
-
-
-var os = require('os');
-//control OS
-//then run command depengin on the OS
-
-del(["dist/"]).then(function(){
- return mkdirp("dist");
+del(["dist/"]).then(function () {
+ return mkdirp("dist");
});
diff --git a/frontend-js/scripts/deploy.js b/frontend-js/scripts/deploy.js
new file mode 100644
index 0000000000..a49284666f
--- /dev/null
+++ b/frontend-js/scripts/deploy.js
@@ -0,0 +1,6 @@
+var fs = require('fs');
+
+var tomcatDirectory = process.env.CATALINA_HOME;
+fs.createReadStream('dist/minerva.js').pipe(fs.createWriteStream(tomcatDirectory + '/webapps/minerva/resources/js/minerva.js'));
+fs.createReadStream('dist/minerva.css').pipe(fs.createWriteStream(tomcatDirectory + '/webapps/minerva/resources/css/minerva.css'));
+
--
GitLab