idk/i2p.plugins.firefox
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

add support for running a Tor Browser unpacked to the portable dir directly

Browse Source 
Former-commit-id: 9b79fb806b
Former-commit-id: 6a3c0d3e2b94256d417f50bddebc00a9fbad8367
This commit is contained in:
idk
2022-10-01 20:34:19 -04:00
parent 2a91ec2f09
commit 52c4fd3dd7
4 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
etc/scripts/torbrowser.sh
View File

@ -6,14 +6,17 @@ if [ -d /etc/default/locale ]; then
locale=$(echo "${LANG}" | sed 's|.UTF-8||g') locale=$(echo "${LANG}" | sed 's|.UTF-8||g')
fi fi
gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org if [ ! -f ./tor.keyring ]; then
gpg --output ./tor.keyring --export torbrowser@torproject.org gpg --auto-key-locate nodefault,wkd --locate-keys torbrowser@torproject.org
gpg --output ./tor.keyring --export torbrowser@torproject.org
fi
wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz" if [ ! -f "tor-browser-linux64-"$version"_"$locale".tar.xz" ]; then
wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz.asc" wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz"
wget -cv "https://www.torproject.org/dist/torbrowser/"$version"/tor-browser-linux64-"$version"_"$locale".tar.xz.asc"
fi
gpgv --keyring ./tor.keyring "tor-browser-linux64-"$version"_"$locale".tar.xz.asc" "tor-browser-linux64-"$version"_"$locale".tar.xz" gpgv --keyring ./tor.keyring "tor-browser-linux64-"$version"_"$locale".tar.xz.asc" "tor-browser-linux64-"$version"_"$locale".tar.xz"
#echo tar xvJf "tor-browser-linux64-"$version"_"$locale".tar.xz" tar xvJf "tor-browser-linux64-"$version"_"$locale".tar.xz"
#echo tar xvJf "tor-browser-linux64-"$version"_"$locale".tar.xz.asc"

4
scripts/build.number
View File

@ -1,3 +1,3 @@
#Build Number for ANT. Do not edit! #Build Number for ANT. Do not edit!
#Sat Oct 01 19:49:02 EDT 2022 #Sat Oct 01 20:18:26 EDT 2022
build.number=113 build.number=114

2
src/i2p.firefox.base.profile/version.md
View File

@ -1,5 +1,5 @@
Profile Version Profile Version
=============== ===============
1.0.1-112 1.0.1-113

22
src/java/net/i2p/i2pfirefox/I2PFirefox.java
View File

@ -164,6 +164,7 @@ public class I2PFirefox extends I2PCommonBrowser {
// list the files in the plugin directory // list the files in the plugin directory
if (pluginFiles != null) { if (pluginFiles != null) {
for (File pluginFile : pluginFiles) { for (File pluginFile : pluginFiles) {
logger.info("CHECKING NEARBY" + pluginFile.getAbsolutePath());
if (pluginFile.getName().equals("firefox") || if (pluginFile.getName().equals("firefox") ||
pluginFile.getName().equals("firefox-bin") || pluginFile.getName().equals("firefox-bin") ||
pluginFile.getName().equals("firefox-esr") || pluginFile.getName().equals("firefox-esr") ||
@ -185,11 +186,27 @@ public class I2PFirefox extends I2PCommonBrowser {
// list the files in the user.dir directory // list the files in the user.dir directory
for (File userDir1 : userDirs) { for (File userDir1 : userDirs) {
File[] userFiles = userDir1.listFiles(); File[] userFiles = userDir1.listFiles();
// list the files in the user.dir directory // list the files in the first user.dir directorys
if (userFiles != null) { if (userFiles != null) {
for (File userFile : userFiles) { for (File userFile : userFiles) {
if (userFile.isDirectory()) //logger.info("CHECKING NEARBY" + userFile.getAbsolutePath());
if (userFile.isDirectory()) {
File[] userFiles2 = userFile.listFiles();
for (File userFile2 : userFiles2) {
//logger.info("CHECKING NEARBY" + userFile2.getAbsolutePath());
if (userFile2.isDirectory())
continue; continue;
if (userFile2.getName().equals("firefox") ||
userFile2.getName().equals("firefox-bin") ||
userFile2.getName().equals("firefox-esr") ||
userFile2.getName().equals("waterfox") ||
userFile2.getName().equals("waterfox-bin") ||
userFile2.getName().equals("librewolf")) {
logger.info("FOUND NEARBY" + userFile2.getAbsolutePath());
return new String[] {userFile2.getAbsolutePath()};
}
}
}
if (userFile.getName().equals("firefox") || if (userFile.getName().equals("firefox") ||
userFile.getName().equals("firefox-bin") || userFile.getName().equals("firefox-bin") ||
userFile.getName().equals("firefox-esr") || userFile.getName().equals("firefox-esr") ||
@ -448,6 +465,7 @@ public class I2PFirefox extends I2PCommonBrowser {
} }
} }
if (isOSX()) { if (isOSX()) {
String[] fg = {""}; String[] fg = {""};
String[] lastArgs = String[] lastArgs =
Stream.concat(Arrays.stream(newArgs), Arrays.stream(fg)) Stream.concat(Arrays.stream(newArgs), Arrays.stream(fg))