ViewVC Help

View File | Revision Log | View Changeset | Root Listing

root/Oni2/java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java

Comparing java/installer2/src/net/oni2/aeinstaller/AEInstaller2.java (file contents):
Revision 772 by alloc, Mon Apr 1 00:12:20 2013 UTC vs.
Revision 776 by alloc, Tue Apr 2 00:16:52 2013 UTC

#	Line 115 | Line 115 | public class AEInstaller2 {
115		Paths.getDownloadPath().mkdirs();
116
117		boolean debug = false;
118	+	boolean useWd = false;
119		boolean noCacheUpdate = false;
120		boolean offline = false;
121		for (String a : args) {
#	Line 124 | Line 125 | public class AEInstaller2 {
125		noCacheUpdate = true;
126		if (a.equalsIgnoreCase("-offline"))
127		offline = true;
128	+	if (a.equalsIgnoreCase("-usewd"))
129	+	useWd = true;
130		}
131		if (!debug) {
132		try {
#	Line 139 | Line 142 | public class AEInstaller2 {
142		SettingsManager.setDebug(debug);
143		SettingsManager.deserializeFromFile(Paths.getSettingsFilename());
144		SettingsManager.setDebug(debug);
145	+	SettingsManager.setUseWorkingDir(useWd);
146		SettingsManager.getInstance().setNoCacheUpdateMode(noCacheUpdate);
147
148		initBundles();
#	Line 256 | Line 260 | public class AEInstaller2 {
260		SVN svn = new SVN();
261		try {
262		int x = svn.checkSVN("http://svn.aei.oni2.net",
263	<	new File(Paths.getPrefsPath(), "bin"));
263	>	Paths.getJarPath());
264		if (x > 0) {
265		// Update available or missing files
266		int res = JOptionPane.showConfirmDialog(null,

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)