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/ServerConfiguration.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
index ce67240..8c91bf2 100644
--- a/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
+++ b/borgbutler-server/src/main/java/de/micromata/borgbutler/server/ServerConfiguration.java
@@ -18,6 +18,7 @@
private int port = WEBSERVER_PORT_DEFAULT;
private boolean webDevelopmentMode = WEB_DEVELOPMENT_MODE_PREF_DEFAULT;
+ private BorgVersion borgVersion = new BorgVersion();
@JsonProperty
public String getCacheDir() {
return ButlerCache.getInstance().getCacheDir().getAbsolutePath();
@@ -31,6 +32,17 @@
return SUPPORTED_LANGUAGES;
}
+ /**
+ * @return a clone of this.borgVersion.
+ */
+ public BorgVersion getBorgVersion() {
+ return new BorgVersion().copyFrom(borgVersion);
+ }
+
+ BorgVersion _getBorgVersion() {
+ return this.borgVersion;
+ }
+
public static String getApplicationHome() {
if (applicationHome == null) {
applicationHome = System.getProperty("applicationHome");
@@ -65,5 +77,7 @@
super.copyFrom(other);
this.port = other.port;
this.webDevelopmentMode = other.webDevelopmentMode;
+ this.borgVersion.copyFrom(other.borgVersion);
+ this.setBorgCommand(this.borgVersion.getBorgCommand());
}
}
--
Gitblit v1.10.0