idk/i2p.plugins.tor-updater
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases Wiki Activity

Well f***. I guess that's an AppImage.

Browse Source
This commit is contained in:
idk
2022-07-14 17:36:08 -04:00
parent c37b7db32c
commit 741a19a8f6
5 changed files with 50 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ shared-modules
debian
_build
.vscode
AppDir

20
DOCKER.md
View File

@ -1,14 +1,28 @@
Docker Usage
============
It is also possible to run this from within a Docker container to avoid
interacting with your base system(for the most part).
```sh
docker build -t eyedeekay/i2p.plugins.tor-manager .
git clone https://i2pgit.org/idk/i2p.plugins.tor-manager.git i2p.plugins.tor-manager && i2p.plugins.tor-manager
docker build -t idk/i2p.plugins.tor-manager .
```
This example shares the X Server with the host, and shares the network with
the host, for the sake of simplicity. A more complex setup might extend this
container with a VNC server and allow the user to connect to it as if it were
a remote server and avoid directly connecting to the host's X Server or some
other means of isolating the browser from the host.
```sh
docker run -it --rm \
--net=host \
--env="DISPLAY" \
--volume="$HOME/.Xauthority:/root/.Xauthority:rw" \
eyedeekay/i2p.plugins.tor-manager
idk/i2p.plugins.tor-manager
```
If you use this without passing the `--net=host` flag, it will always start
a new I2P router inside of the Docker container. If you would like to use an I2P
router running on the host system, then you will need to pass the `--net=host`
flag.

27
Dockerfile
View File

@ -52,20 +52,21 @@ RUN echo "deb http://deb.debian.org/debian oldstable main" >> /etc/apt/sources.l
p7zip-full \
&& \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
ln -sf /usr/lib/go-1.17/bin/go /usr/bin/go && \
wget https://nsis.sourceforge.io/mediawiki/images/c/c7/ShellExecAsUser.zip && \
wget https://nsis.sourceforge.io/mediawiki/images/1/1d/ShellExecAsUserUnicodeUpdate.zip && \
wget https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z && \
ln -sf /usr/lib/go-1.17/bin/go /usr/bin/go
# && \
# wget https://nsis.sourceforge.io/mediawiki/images/c/c7/ShellExecAsUser.zip && \
# wget https://nsis.sourceforge.io/mediawiki/images/1/1d/ShellExecAsUserUnicodeUpdate.zip && \
# wget https://nsis.sourceforge.io/mediawiki/images/6/68/ShellExecAsUser_amd64-Unicode.7z && \
# unzip them to /usr/share/nsis/Plugins/
unzip ShellExecAsUser.zip -d /usr/share/nsis/Plugins/x86-ansi && \
unzip ShellExecAsUserUnicodeUpdate.zip -d /usr/share/nsis/Plugins/x86-unicode && \
7zr x ShellExecAsUser_amd64-Unicode.7z -o/usr/share/nsis/Plugins/amd64-unicode
RUN git clone https://github.com/eyedeekay/go-I2P-jpackage /go/src/github.com/eyedeekay/go-I2P-jpackage && \
cd /go/src/github.com/eyedeekay/go-I2P-jpackage && \
touch /go/src/github.com/eyedeekay/go-I2P-jpackage/build.windows.I2P.tar.xz && \
touch /go/src/github.com/eyedeekay/go-I2P-jpackage/build.linux.I2P.tar.xz && \
go generate && \
git clone https://i2pgit.org/idk/i2p.plugins.tor-manager /go/src/i2pgit.org/idk/i2p.plugins.tor-manager
# unzip ShellExecAsUser.zip -d /usr/share/nsis/Plugins/x86-ansi && \
# unzip ShellExecAsUserUnicodeUpdate.zip -d /usr/share/nsis/Plugins/x86-unicode && \
# 7zr x ShellExecAsUser_amd64-Unicode.7z -o/usr/share/nsis/Plugins/amd64-unicode
RUN git clone https://github.com/eyedeekay/go-I2P-jpackage /go/src/github.com/eyedeekay/go-I2P-jpackage
RUN cd /go/src/github.com/eyedeekay/go-I2P-jpackage
RUN touch /go/src/github.com/eyedeekay/go-I2P-jpackage/build.windows.I2P.tar.xz
RUN touch /go/src/github.com/eyedeekay/go-I2P-jpackage/build.linux.I2P.tar.xz
RUN make
RUN git clone https://i2pgit.org/idk/i2p.plugins.tor-manager /go/src/i2pgit.org/idk/i2p.plugins.tor-manager
WORKDIR /go/src/i2pgit.org/idk/i2p.plugins.tor-manager
#CMD ls /go/src/i2pgit.org/idk/i2p.plugins.tor-manager /go/src/github.com/eyedeekay/go-I2P-jpackage
RUN GOOS=linux GOARCH=amd64 make build

22
Makefile
View File

@ -347,9 +347,6 @@ deb: clean
dpkg-buildpackage -us -uc
debsrc: clean
mv "hankhill19580_at_gmail.com.crl" ../; true
mv "hankhill19580_at_gmail.com.crt" ../; true
mv "hankhill19580_at_gmail.com.pem" ../; true
rm ../i2p.plugins.tor-manager_$(VERSION).orig.tar.gz -f
tar --exclude=".git" \
--exclude="hankhill19580_at_gmail.com.crl" \
@ -362,9 +359,6 @@ debsrc: clean
--exclude="flatpak.repo.i2p.plugins.tor-manager" \
-cvzf ../i2p.plugins.tor-manager_$(VERSION).orig.tar.gz .
debuild -S
mv "../hankhill19580_at_gmail.com.crl" ./
mv "../hankhill19580_at_gmail.com.crt" ./
mv "../hankhill19580_at_gmail.com.pem" ./
DATE=`date +%Y/%m/%d`
@ -476,3 +470,19 @@ flatpak.repo.i2p.plugins.tor-manager:
flatpak-upload: flatpak-repo flatpak.repo.i2p.plugins.tor-manager
cp -rv repo/* flatpak.repo.i2p.plugins.tor-manager/
cd flatpak.repo.i2p.plugins.tor-manager && ./find.sh
clean-appimage:
rm -rf AppDir
appimage: clean-appimage
mkdir -p AppDir/usr/bin AppDir/usr/lib AppDir/usr/share/applications AppDir/usr/share/icons AppDir/var/lib/i2pbrowser/icons
cp -v i2p.plugins.tor-manager AppDir/usr/bin/i2p.plugins.tor-manager
cp -v i2ptorbrowser.desktop AppDir/usr/share/applications/i2p.plugins.tor-manager.desktop
cp -v i2ptorbrowser.desktop AppDir/i2p.plugins.tor-manager.desktop
cp -v garliconion.png AppDir/var/lib/i2pbrowser/icons/garliconion.png
cp -v garliconion.png AppDir/I2P_in-Tor-Browser-x86_64.png
cp -v garliconion.png AppDir/.DirIcon
cp -v i2p.plugins.tor-manager AppDir/AppRun
find AppDir -name '*.desktop' -exec sed -i 's|garliconion.png|garliconion|g' {} \;
chmod +x AppDir/AppRun
~/Downloads/appimagetool-x86_64.AppImage AppDir/

2
i2ptorbrowser.desktop
View File

@ -3,7 +3,7 @@ Encoding=UTF-8
Version=1.0
Type=Application
Terminal=false
Exec=/bin/sh -c "i2pbrowser -directory=$HOME/.i2p/browser"
Exec=/bin/sh -c "i2pbrowser -directory=~/.i2p/browser"
Name=I2P in Tor Browser
Categories=Network;WebBrowser;
Icon=/var/lib/i2pbrowser/icons/garliconion.png