Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jamesquinley/DelegationServices/delegationServices.java
This commit is contained in:
James Quinley 2022-09-16 22:48:39 -07:00
commit b7ee2c44d1

View File

@ -12,6 +12,7 @@ import com.mongodb.client.MongoCollection;
import com.mongodb.client.MongoDatabase; import com.mongodb.client.MongoDatabase;
import org.bson.Document; import org.bson.Document;
import java.io.File;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
@ -1417,7 +1418,8 @@ public class delegationServices {
String policyDocument; String policyDocument;
try try
{ {
String fileName = "~/home/ocs/policy/launcher/legal/eula.txt"; File homedir = new File(System.getProperty("user.home"));
String fileName = homedir + "/ocs/policy/launcher/legal/eula.txt";
Path path = Paths.get(fileName); Path path = Paths.get(fileName);
byte[] bytes = Files.readAllBytes(path); byte[] bytes = Files.readAllBytes(path);
List<String> allLines = Files.readAllLines(path, StandardCharsets.UTF_8); List<String> allLines = Files.readAllLines(path, StandardCharsets.UTF_8);