Skip to content

Commit

Permalink
Fix up some old .jar references
Browse files Browse the repository at this point in the history
  • Loading branch information
parg committed Sep 12, 2017
1 parent 9e67c05 commit 75fd012
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 14 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1063,7 +1063,7 @@

log.log( LoggerChannel.LT_INFORMATION, " This is a built-in plugin, updating core" );

CorePatchChecker.patchAzureus2( update.getCheckInstance(), data, plugin.getPluginID() + "_" + new_version, log );
CorePatchChecker.patchBiglyBT( update.getCheckInstance(), data, plugin.getPluginID() + "_" + new_version, log );

// always need to restart for this

Expand Down
10 changes: 5 additions & 5 deletions core/src/com/biglybt/update/CorePatchChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ public void complete(Update update) {
return;
}

String patch_prefix = "Azureus2_" + Constants.getBaseVersion() + "_P";
String patch_prefix = "BiglyBT_" + Constants.getBaseVersion() + "_P";

int highest_p = -1;
File highest_p_file = null;
Expand Down Expand Up @@ -256,7 +256,7 @@ public void complete(Update update) {
InputStream pis = new FileInputStream( highest_p_file );

try{
patchAzureus2( instance, pis, "P" + highest_p, plugin_interface.getLogger().getChannel( "CorePatcher" ));
patchBiglyBT( instance, pis, "P" + highest_p, plugin_interface.getLogger().getChannel( "CorePatcher" ));

Logger.log(new LogAlert(LogAlert.UNREPEATABLE, LogAlert.AT_INFORMATION,
"Patch " + highest_p_file.getName() + " ready to be applied"));
Expand Down Expand Up @@ -285,7 +285,7 @@ public void complete(Update update) {
}

public static void
patchAzureus2(
patchBiglyBT(
UpdateCheckInstance instance,
InputStream pis,
String resource_tag,
Expand All @@ -297,7 +297,7 @@ public void complete(Update update) {
InputStream is = null;

try{
String resource_name = "Azureus2_" + resource_tag + ".jar";
String resource_name = "BiglyBT_" + resource_tag + ".jar";

UpdateInstaller installer = instance.createInstaller();

Expand All @@ -307,7 +307,7 @@ public void complete(Update update) {

String jarPath = installer.getInstallDir();

File jarFile = new File(jarPath, "Azureus2.jar");
File jarFile = new File(jarPath, "BiglyBT.jar");

is = new FileInputStream( jarFile );

Expand Down
4 changes: 2 additions & 2 deletions core/src/com/biglybt/update/CorePatchLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
{
// everytime a patch is issued this number must go up by one
// The resulting patch file must include this file and be named
// Azureus2_<mainline_build>_P<patch_level>.pat
// e.g. Azureus2_2.0.8.5_P1.pat
// BiglyBT_<mainline_build>_P<patch_level>.pat
// e.g. BiglyBT_2.0.8.5_P1.pat
// dont' reset to 1 on a new mainline, keep going up!

// Level 1: 2302 - fix for DHT version propagation problem
Expand Down
8 changes: 2 additions & 6 deletions core/src/com/biglybt/update/CoreUpdateChecker.java
Original file line number Diff line number Diff line change
Expand Up @@ -198,10 +198,6 @@
throw( new Exception( "No update file details in reply" ));
}

//latest_version = "3.0.0.3";
//latest_file_name = "http://torrent.vuze.com:88/torrents/Azureus2.5.0.0.jar.torrent";
//latest_file_name = "Azureus2.5.0.0.jar.torrent";

String msg = "Core: latest_version = '" + latest_version + "', file = '" + latest_file_name + "'";

URL full_download_url;
Expand Down Expand Up @@ -668,8 +664,8 @@

}else{

String temp_jar_name = "Azureus2_" + version + ".jar";
String target_jar_name = "Azureus2.jar";
String temp_jar_name = "BiglyBT_" + version + ".jar";
String target_jar_name = "BiglyBT.jar";

UpdateInstaller installer = checker.createInstaller();

Expand Down

0 comments on commit 75fd012

Please sign in to comment.