From: Felix Dörre <felix@dogcraft.de>
Date: Tue, 1 Jul 2014 23:22:37 +0000 (+0200)
Subject: Use gigi.properties in DatabaseManager (if no cmdline args)
X-Git-Url: https://code.wpia.club/?p=gigi.git;a=commitdiff_plain;h=067e86ec9a0ab2d9a62acfa95868a0a4fe3ea3ed;hp=1a026ed91ca5443f85c90ce2b87f63585ecfe0fc

Use gigi.properties in DatabaseManager (if no cmdline args)
---

diff --git a/util/org/cacert/gigi/util/DatabaseManager.java b/util/org/cacert/gigi/util/DatabaseManager.java
index da0c054c..547922e6 100644
--- a/util/org/cacert/gigi/util/DatabaseManager.java
+++ b/util/org/cacert/gigi/util/DatabaseManager.java
@@ -1,12 +1,14 @@
 package org.cacert.gigi.util;
 
 import java.io.File;
+import java.io.FileReader;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Properties;
 
 public class DatabaseManager {
 	public static String readFile(File f) throws IOException {
@@ -14,6 +16,13 @@ public class DatabaseManager {
 	}
 	public static void main(String[] args) throws SQLException,
 			ClassNotFoundException, IOException {
+		if (args.length == 0) {
+			Properties p = new Properties();
+			p.load(new FileReader("config/gigi.properties"));
+			args = new String[]{p.getProperty("sql.driver"),
+					p.getProperty("sql.url"), p.getProperty("sql.user"),
+					p.getProperty("sql.password")};
+		}
 		if (args.length < 4) {
 			System.err
 					.println("Usage: com.mysql.jdbc.Driver jdbc:mysql://localhost/cacert user password");