From 1c087fae322a1b07bb7bd554ee10ff473c47c727 Mon Sep 17 00:00:00 2001
From: Fin Reinhard <fin.reinhard@icloud.com>
Date: Tue, 22 Jan 2019 20:51:03 +0000
Subject: [PATCH] Merge branch 'master' into feature/15-archive-view-url
---
borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
index 07f1b63..93f77ce 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/Main.java
@@ -14,6 +14,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.awt.*;
import java.io.*;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -81,7 +82,11 @@
return;
}
}
- RunningMode.setServerType(RunningMode.ServerType.SERVER);
+ if (Desktop.isDesktopSupported()) {
+ RunningMode.setServerType(RunningMode.ServerType.DESKTOP);
+ } else {
+ RunningMode.setServerType(RunningMode.ServerType.SERVER);
+ }
RunningMode.logMode();
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
@@ -91,6 +96,7 @@
});
JettyServer server = startUp();
+ BorgInstallation.getInstance().initialize();
if (!line.hasOption('q')) {
try {
--
Gitblit v1.10.0