From f5b3310103ea177182c0eb1d29065b44dd228de0 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Mon, 19 Apr 2021 15:04:36 +0000
Subject: [PATCH] Support of $BorgButlerHome/environment.sh for setting java options.
---
borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
index 2fdc9f1..a9a4fdc 100644
--- a/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
+++ b/borgbutler-core/src/main/kotlin/de/micromata/borgbutler/config/ConfigurationHandler.kt
@@ -76,6 +76,30 @@
FileUtils.copyFile(file, backupFile)
}
+ init {
+ workingDir = if (butlerHomeDir != null) {
+ File(butlerHomeDir)
+ } else {
+ File(System.getProperty("user.home"), BUTLER_HOME_DIR)
+ }
+ log.info("Using directory '" + workingDir.getAbsolutePath() + "' as BorgButler's home directory.")
+ if (!workingDir.exists()) {
+ log.info("Creating borg-butlers working directory: " + workingDir.getAbsolutePath())
+ workingDir.mkdirs()
+ }
+ configFile = File(workingDir, CONFIG_FILENAME)
+ configBackupDir = File(workingDir, CONFIG_BACKUP_DIR)
+ if (!configBackupDir.exists()) {
+ log.info("Creating borg-butlers backup directory: " + configBackupDir.absolutePath)
+ configBackupDir.mkdirs()
+ }
+ val environmentFile = File(workingDir, ENVIRONMENT_FILE)
+ if (!environmentFile.exists()) {
+ environmentFile.writeText(ENVIRONMENT_FILE_INITIAL_CONTENT)
+ }
+ read()
+ }
+
companion object {
private var instance: ConfigurationHandler? = null
private const val BUTLER_HOME_DIR = ".borgbutler"
@@ -122,25 +146,13 @@
val yaml = FileUtils.readFileToString(configFile, Definitions.STD_CHARSET)
return YamlUtils.fromYaml(configClazz, yaml)
}
- }
- init {
- workingDir = if (butlerHomeDir != null) {
- File(butlerHomeDir)
- } else {
- File(System.getProperty("user.home"), BUTLER_HOME_DIR)
- }
- log.info("Using directory '" + workingDir.getAbsolutePath() + "' as BorgButler's home directory.")
- if (!workingDir.exists()) {
- log.info("Creating borg-butlers working directory: " + workingDir.getAbsolutePath())
- workingDir.mkdirs()
- }
- configFile = File(workingDir, CONFIG_FILENAME)
- configBackupDir = File(workingDir, CONFIG_BACKUP_DIR)
- if (!configBackupDir.exists()) {
- log.info("Creating borg-butlers backup directory: " + configBackupDir.absolutePath)
- configBackupDir.mkdirs()
- }
- read()
+ private const val ENVIRONMENT_FILE = "environment.sh"
+ private const val ENVIRONMENT_FILE_INITIAL_CONTENT = "#!/bin/bash\n\n" +
+ "# Set the java options here:\n" +
+ "#export JAVA_OPTS=-DXmx4g\n" +
+ "export JAVA_OPTS=\n\n" +
+ "# Set your options here (will be used for starting\n" +
+ "export JAVA_ARGS=\n"
}
}
--
Gitblit v1.10.0