From e37ae33a4f8f3bd8226b4b5875fca2c7629510ee Mon Sep 17 00:00:00 2001 From: MobiusDevelopment Date: Sun, 29 Jan 2023 01:13:05 +0200 Subject: [PATCH] Fixed database installer path for dumps with Linux. Contributed by L2Hanesfor. --- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- .../java/org/l2jmobius/tools/dbinstaller/RunTasks.java | 2 +- .../tools/dbinstaller/util/mysql/DBDumper.java | 10 +++++----- 62 files changed, 186 insertions(+), 186 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName()); diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/RunTasks.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/RunTasks.java index ef67f21ace..73573b1559 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/RunTasks.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/RunTasks.java @@ -43,7 +43,7 @@ public class RunTasks extends Thread @Override public void run() { - new DBDumper(_frame, _db); + new DBDumper(_frame, _db, _sqlDir); final ScriptExecutor exec = new ScriptExecutor(_frame); _frame.appendToProgressArea("Installing Database Content..."); exec.execSqlBatch(new File(_sqlDir)); diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java index 89aa6111d9..a018f73d4c 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/tools/dbinstaller/util/mysql/DBDumper.java @@ -39,14 +39,14 @@ public class DBDumper DBOutputInterface _frame; String _db; - public DBDumper(DBOutputInterface frame, String db) + public DBDumper(DBOutputInterface frame, String db, String dir) { _frame = frame; _db = db; - createDump(); + createDump(dir); } - public void createDump() + public void createDump(String dir) { try (Formatter form = new Formatter()) { @@ -54,8 +54,8 @@ public class DBDumper try (Statement s = con.createStatement(); ResultSet rset = s.executeQuery("SHOW TABLES")) { - final File dump = new File("dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); - new File("dumps").mkdir(); + final File dump = new File(dir + "../../dumps", form.format("%1$s_dump_%2$tY%2$tm%2$td-%2$tH%2$tM%2$tS.sql", _db, new GregorianCalendar().getTime()).toString()); + new File(dir + "../../dumps").mkdir(); dump.createNewFile(); _frame.appendToProgressArea("Writing dump " + dump.getName());