Merge pull request #30 from aktos-io/dev

Dev
aktos-io · Apr 29, 2019 · 85ca534 · 85ca534
2 parents 5e0e266 + f3a1afe
commit 85ca534
Show file tree

Hide file tree

Showing 16 changed files with 4,804 additions and 4,433 deletions.
diff --git a/production.service b/production.service
@@ -7,3 +7,4 @@ launch-service $(calc-session-name "$0")
 # run commands in tmux session
 run-in-tmux "cd servers" './run-ls webserver.ls'
 run-in-tmux "cd servers" './run-ls occ-service.ls'
+run-in-tmux "cd ~/node-occ-sample" "npm start"
diff --git a/scada.js b/scada.js
diff --git a/servers/INSTALL.md b/servers/INSTALL.md
@@ -0,0 +1 @@
+Follow the README on https://github.com/ceremcem/node-occ, #On Linux section
diff --git a/update-webui.sh b/update-webui.sh
@@ -4,5 +4,5 @@ DIR=$(dirname "$(readlink -f "$0")")
 $DIR/pull.sh
 [[ $1 = "--less" ]] || { ./scada.js/install-modules.sh; npm i; }
 cd scada.js
-gulp --webapp main --production
+./production-build.sh main
 npm test
+13 −3		components/router/index.ls
+16 −11		gulpfile.ls
+13 −0		production-build.sh
+1 −1		watch.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Follow the README on https://github.com/ceremcem/node-occ, #On Linux section