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

Remove unix changes, they can go in EXPERIMENTAL-debian

Browse Source
This commit is contained in:
idk
2021-07-23 19:39:07 -04:00
parent 99f6029578
commit f54d989ea7
6 changed files with 14 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -217,12 +217,12 @@ checkinstall: version
--pkgrelease=1 \ --pkgrelease=1 \
--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \ --pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
--maintainer="$(SIGNER)" \ --maintainer="$(SIGNER)" \
--requires="firefox,wget,i2p,i2p-router" \ --requires="firefox,wget" \
--suggests="i2p,i2p-router,syndie,tor,tsocks" \ --suggests="i2p,i2p-router,syndie,tor,tsocks" \
--nodoc \ --nodoc \
--deldoc=yes \ --deldoc=yes \
--deldesc=yes \ --deldesc=yes \
--backup=no --backup=no
su3: jpackage su3: distclean jpackage
su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)" su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"

10
README.md
View File

@@ -127,9 +127,9 @@ End-to-End Windows build process using WSL
with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%` your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
Cygwin installed. You must have `NSIS.exe` installed and available on your `%PATH%`. Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
You must have Git for Windows installed. When installing git for Windows, you should `%PATH%`. You must have Git for Windows installed. When installing git for Windows,
select "Checkout as is, commit as is" and leave line-endings alone. you should select "Checkout as is, commit as is" and leave line-endings alone.
1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps) 1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps)
2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71) 2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71)
@@ -163,8 +163,8 @@ End-to-End Windows build process using Cygwin
with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%` your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
Cygwin installed. You must have `NSIS.exe` installed and available on your `%PATH%`. WSL and git bash installed. You must have `NSIS.exe` installed and `makensis` available on your
You must have Git for Windows installed. When installing git for Windows, you should `%PATH%`. You must have Git for Windows installed. When installing git for Windows, you should
select "Checkout as is, commit as is" and leave line-endings alone. select "Checkout as is, commit as is" and leave line-endings alone.
TODO: Add links to the respective instructions for each of these. TODO: Add links to the respective instructions for each of these.

6
src/unix/desktop/i2pconfig.desktop
View File

@@ -3,7 +3,7 @@ Encoding=UTF-8
Version=1.0 Version=1.0
Type=Application Type=Application
Terminal=false Terminal=false
Exec=/usr/local/bin/i2psite Exec=/usr/local/bin/i2pconfig
Name=Edit I2P Site Name=I2P Configuration
Categories=Network; Categories=Network;WebBrowser;
Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico

8
src/unix/i2pbrowser.sh
View File

@@ -5,11 +5,7 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
fi fi
if [ ! -z $I2PROUTER ]; then if [ ! -z $I2PROUTER ]; then
echo "$I2PROUTER" "$I2PCOMMAND" "$I2PROUTER" start
http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || "$I2PROUTER" "$I2PCOMMAND"
else if [ -d "I2P/bin" ]; then
http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || ./I2P/bin/I2P; \
echo "running the jpackaged I2P router since we can't find another one to use."
fi fi
if [ -z $BROWSING_PROFILE ]; then if [ -z $BROWSING_PROFILE ]; then
@@ -19,8 +15,6 @@ fi
if [ ! -d "$BROWSING_PROFILE" ]; then if [ ! -d "$BROWSING_PROFILE" ]; then
mkdir -p "$BROWSING_PROFILE" mkdir -p "$BROWSING_PROFILE"
cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE" cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE"
else
cp -vr /var/lib/i2pbrowser/profile/extensions/* "$BROWSING_PROFILE/extensions"
fi fi
if [ ! -f "$BROWSING_PROFILE/user.js" ]; then if [ ! -f "$BROWSING_PROFILE/user.js" ]; then

16
src/unix/i2pbrowserdebianrc
View File

@@ -1,29 +1,17 @@
I2PROUTER=$(which i2prouter) I2PROUTER=$(which i2prouter)
I2PCOMMAND="start"
if [ -z $I2PROUTER ]; then if [ -z $I2PROUTER ]; then
I2PROUTER=/usr/sbin/i2prouter I2PROUTER=/usr/sbin/i2prouter
I2PCOMMAND="start"
fi
if [ ! -f $I2PROUTER ]; then
I2PROUTER="/opt/i2p/bin/I2P"
I2PCOMMAND=""
fi fi
if [ ! -f $I2PROUTER ]; then if [ ! -f $I2PROUTER ]; then
I2PROUTER="$HOME/i2p/i2prouter" I2PROUTER="$HOME/i2p/i2prouter"
I2PCOMMAND="start"
fi fi
if [ ! -f $I2PROUTER ]; then if [ ! -f $I2PROUTER ]; then
I2PROUTER="" I2PROUTER=""
I2PCOMMAND=""
echo "no i2prouter detected"
fi fi
wget -q -O - "http://localhost:7657" >/dev/null && I2PROUTER=""
echo "$I2PROUTER"
wget -q -O - "http://localhost:7657" >/dev/null && I2PROUTER="" && I2PCOMMAND=""
echo command: "$I2PROUTER" "$I2PCOMMAND"

9
src/unix/i2pconfig.sh
View File

@@ -5,12 +5,7 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
fi fi
if [ ! -z $I2PROUTER ]; then if [ ! -z $I2PROUTER ]; then
echo "$I2PROUTER" "$I2PCOMMAND" "$I2PROUTER" start
http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || "$I2PROUTER" "$I2PCOMMAND"
else if [ -d "I2P/bin" ]; then
http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || ./I2P/bin/I2P; \
echo "running the jpackaged I2P router since we can't find another one to use."
fi fi
if [ -f "$HOME/.i2p/router.config" ]; then if [ -f "$HOME/.i2p/router.config" ]; then
@@ -35,8 +30,6 @@ fi
if [ ! -d "$CONFIGURING_PROFILE" ]; then if [ ! -d "$CONFIGURING_PROFILE" ]; then
mkdir -p "$CONFIGURING_PROFILE" mkdir -p "$CONFIGURING_PROFILE"
cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE" cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE"
else
cp -vr /var/lib/i2pbrowser/profile/extensions/* "$CONFIGURING_PROFILE/extensions"
fi fi
if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then