From 9206a7de837573049481a8fa4f224fe09a904ffd Mon Sep 17 00:00:00 2001 From: Timm Fitschen <timm.fitschen@ds.mpg.de> Date: Wed, 19 Dec 2018 21:00:09 +0100 Subject: [PATCH] MAINT: update webui --- caosdb-webui | 2 +- makefile | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/caosdb-webui b/caosdb-webui index 403c977e..61bcb792 160000 --- a/caosdb-webui +++ b/caosdb-webui @@ -1 +1 @@ -Subproject commit 403c977e465774ba1dadc5bbedf4bec774a6d73d +Subproject commit 61bcb7923569b628d4754770069e709a47c01238 diff --git a/makefile b/makefile index 84f5484b..70e84bef 100644 --- a/makefile +++ b/makefile @@ -60,6 +60,7 @@ clean: clean-antlr clean-antlr: rm -rf target/generated-sources/antlr4/ +.PHONY: run-server-screen run-server-screen: @if test "$$(screen -ls | grep -c 'caosdb-screen')" -eq "1"; then \ echo "server is probably running. try 'screen -ls'"; \ @@ -74,11 +75,13 @@ run-server-screen: done; \ +.PHONY: stop-server-screen stop-server-screen: # stop screen session with server @screen -S caosdb-screen -X hardcopy screen.log || true @screen -S caosdb-screen -p server -X stuff "^C" +.PHONY: run-debug-screen run-debug-screen: @if test "$$(screen -ls | grep -c 'caosdb-debug-screen')" -eq "1"; then \ echo "server is probably running. try 'screen -ls'"; \ @@ -93,6 +96,7 @@ run-debug-screen: done; \ +.PHONY: stop-debug-screen stop-debug-screen: # stop screen session with debug server @screen -S caosdb-debug-screen -X hardcopy screen.log || true -- GitLab