I2P_Developers/i2p.firefox
3
0
Fork 1
Code Issues 14 Pull Requests Packages Projects Releases Wiki Activity

fix build issues, allow overriding i2p version with a file

Browse Source
This commit is contained in:
idk
2021-07-15 15:48:34 -04:00
parent a8117ce0fc
commit 7ef6e9149d
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -1,4 +1,5 @@
build build
*.deb *.deb
*.tgz *.tgz
./I2P/ ./I2P/
i2pversion_override

4
build.sh
View File

@@ -3,6 +3,10 @@ set -e
. i2pversion . i2pversion
if [ -f i2pversion_override ]; then
. i2pversion_override
fi
JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ') JAVA=$(java --version | tr -d 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ\n' | cut -d ' ' -f 2 | cut -d '.' -f 1 | tr -d '\n\t\- ')
if [ "$JAVA" -lt "14" ]; then if [ "$JAVA" -lt "14" ]; then

11
java/net/i2p/router/WindowsUpdatePostProcessor.java
View File

@@ -5,30 +5,33 @@ import java.util.*;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import static net.i2p.update.UpdateType.*; import static net.i2p.update.UpdateType.*;
import net.i2p.I2PAppContext;
import net.i2p.update.UpdateType; import net.i2p.update.UpdateType;
import net.i2p.update.UpdatePostProcessor; import net.i2p.update.UpdatePostProcessor;
import net.i2p.util.Log;
import net.i2p.util.SystemVersion; import net.i2p.util.SystemVersion;
import java.lang.ProcessBuilder; import java.lang.ProcessBuilder;
import java.lang.Process; import java.lang.Process;
import java.lang.InterruptedException; import java.lang.InterruptedException;
public class WindowsUpdatePostProcessor implements UpdatePostProcessor { public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(WindowsUpdatePostProcessor.class); private final Log _log = I2PAppContext.getGlobalContext().logManager().getLog(WindowsUpdatePostProcessor.class);
protected Router i2pRouter = null; protected Router i2pRouter = null;
public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file) throws IOException { public void updateDownloadedandVerified(UpdateType type, int fileType, String version, File file) throws IOException {
if (fileType == 6) { if (fileType == 6) {
newFile = moveUpdateInstaller(file); File newFile = moveUpdateInstaller(file);
runUpdateInstaller(newFile); runUpdateInstaller(newFile);
} }
} }
private File moveUpdateInstaller(File file){ private File moveUpdateInstaller(File file){
RouterContext i2pContext = i2prouter.getRouterContext(); RouterContext i2pContext = i2pRouter.getContext();
if (i2pContext != null) { if (i2pContext != null) {
File appDir = i2pContext.getAppDir(); File appDir = i2pContext.getAppDir();
File newFile = new File(i2pContext.getAppDir().getAbsolutePath(), file.Name()); File newFile = new File(i2pContext.getAppDir().getAbsolutePath(), file.getName());
file.renameTo(newFile); file.renameTo(newFile);
return newFile; return newFile;
} }
@@ -41,7 +44,7 @@ public class WindowsUpdatePostProcessor implements UpdatePostProcessor {
pb.start(); pb.start();
} catch (IOException ex) { } catch (IOException ex) {
if (_log.shouldWarn()) if (_log.shouldWarn())
_log.warn("Unable to loop update-program in background. Update will fail." + xi2plocation); _log.warn("Unable to loop update-program in background. Update will fail.");
} }
} }