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-core/src/main/java/de/micromata/borgbutler/config/Configuration.java | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
index d06e30b..5ba55a6 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/config/Configuration.java
@@ -24,9 +24,13 @@
@JsonIgnore
@Setter(AccessLevel.PACKAGE)
private File workingDir;
-
+ /**
+ * The path of the borg command to use.
+ */
@Getter
- private String borgCommand = "borg";
+ @Setter
+ private String borgCommand;
+
/**
* Default is 100 MB (approximately).
*/
@@ -85,13 +89,8 @@
}
public List<BorgRepoConfig> getRepoConfigs() {
- if (!ConfigurationHandler.getConfiguration().isShowDemoRepos()) {
- return repoConfigs;
- }
- List<BorgRepoConfig> result = new ArrayList<>();
- result.addAll(repoConfigs);
- DemoRepos.addDemoRepos(result);
- return result;
+ DemoRepos.handleDemoRepos(repoConfigs);
+ return repoConfigs;
}
List<BorgRepoConfig> _getRepoConfigs() {
--
Gitblit v1.10.0