mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-05-19 03:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust windows buildscripts to use appdata instead of userhome/hard/coded/path

Browse Source
This commit is contained in:
Armin Schrenk
2023-06-20 17:32:23 +02:00
parent ec645a4bb9
commit ebea8ef7e5
6 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/org/cryptomator/common/Environment.java
View File

@@ -2,6 +2,7 @@ package org.cryptomator.common;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
import org.apache.commons.lang3.SystemUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,7 +19,7 @@ import java.util.stream.StreamSupport;
public class Environment {
private static final Logger LOG = LoggerFactory.getLogger(Environment.class);
private static final char PATH_LIST_SEP = ':';
private static final char PATH_LIST_SEP = SystemUtils.IS_OS_WINDOWS? ';':':';
private static final int DEFAULT_MIN_PW_LENGTH = 8;
private static final String SETTINGS_PATH_PROP_NAME = "cryptomator.settingsPath";
private static final String IPC_SOCKET_PATH_PROP_NAME = "cryptomator.ipcSocketPath";

1
src/main/java/org/cryptomator/common/PropertiesPreprocessor.java
View File

@@ -34,6 +34,7 @@ public class PropertiesPreprocessor {
switch (match.group(1)) {
case "appdir" -> ENV.get("APPDIR");
case "appdata" -> ENV.get("APPDATA");
case "localappdata" -> ENV.get("LOCALAPPDATA");
case "userhome" -> System.getProperty("user.home");
default -> {
LOG.warn("Found unknown variable @{{}} in property value {}.", match.group(), value);