Fixed database installer path for dumps with Linux.

Contributed by L2Hanesfor.
This commit is contained in:
MobiusDevelopment 2023-01-29 01:13:05 +02:00
parent 6b9eee7008
commit e37ae33a4f
62 changed files with 186 additions and 186 deletions

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());

View File

@ -43,7 +43,7 @@ public class RunTasks extends Thread
@Override @Override
public void run() public void run()
{ {
new DBDumper(_frame, _db); new DBDumper(_frame, _db, _sqlDir);
final ScriptExecutor exec = new ScriptExecutor(_frame); final ScriptExecutor exec = new ScriptExecutor(_frame);
_frame.appendToProgressArea("Installing Database Content..."); _frame.appendToProgressArea("Installing Database Content...");
exec.execSqlBatch(new File(_sqlDir)); exec.execSqlBatch(new File(_sqlDir));

View File

@ -39,14 +39,14 @@ public class DBDumper
DBOutputInterface _frame; DBOutputInterface _frame;
String _db; String _db;
public DBDumper(DBOutputInterface frame, String db) public DBDumper(DBOutputInterface frame, String db, String dir)
{ {
_frame = frame; _frame = frame;
_db = db; _db = db;
createDump(); createDump(dir);
} }
public void createDump() public void createDump(String dir)
{ {
try (Formatter form = new Formatter()) try (Formatter form = new Formatter())
{ {
@ -54,8 +54,8 @@ public class DBDumper
try (Statement s = con.createStatement(); try (Statement s = con.createStatement();
ResultSet rset = s.executeQuery("SHOW TABLES")) 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()); 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("dumps").mkdir(); new File(dir + "../../dumps").mkdir();
dump.createNewFile(); dump.createNewFile();
_frame.appendToProgressArea("Writing dump " + dump.getName()); _frame.appendToProgressArea("Writing dump " + dump.getName());