diff --git a/README.md b/README.md index a284efa..06ad142 100644 --- a/README.md +++ b/README.md @@ -67,45 +67,6 @@ to the `licenses` directory. Then, add the full license to the `cat` command in the `build/licenses` make target. The build/licenses target is run automatically during the build process. -Unix Support ------------- - -It is possible to use these profiles on Linux and possibly other -Unixes, if Firefox is already installed on the system. It can be -installed system-wide using the `make install` target. Running -`make install` requires root, and requires `make` to have been run -first. To install on Unix, system-wide, run: - - make - sudo make install - -To run without installing them system wide, unpack the `profile*.tgz` -to a location of your choice and run the `i2pbrowser.sh` script. This -will start a Firefox profile configured to use I2P. - - tar xvf profile-0.3.tgz - cd profile - ./i2pbrowser.sh - -If you want to run the app-like i2pconfig browser, then follow the -same steps with app-profile*.tgz. - - tar xvf app-profile-0.3.tgz - cd app-profile - ./i2pconfig.sh - -To generate a `deb` package, install the package `checkinstall` and run -the `make checkinstall` target after building with `make`. - - make - make checkinstall - sudo apt install ./i2p-firefox*.deb - -If you want to set up i2pconfig to run when you start the service -with `sudo service i2p start` then you can run the script: - - /usr/local/bin/i2p-config-service-setup - Including a jpackaged I2P Router -------------------------------- @@ -243,21 +204,31 @@ signed update file. Docker Support -------------- -You can use a Docker container to install this browser profile as well. In order -to do this, you can run the commands: +**MOVED, DEPRECATION WARNING:** Most of this functionality has been moved +to http://git.idk.i2p/idk/i2p.plugins.native which is more stable, +easier to build and use, and easier to incorporate into other +projects. - xhost + local:docker - docker run -it --rm \ - --net=host \ - -e DISPLAY=unix$(DISPLAY) \ - -v /tmp/.X11-unix:/tmp/.X11-unix \ - geti2p/i2p.firefox firefox --profile /src/build/profile + - https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/docker.sh -To build and run the container locally, clone this repository and run the +Unix Support +------------ - make run +**MOVED. DEPRECATION WARNING:** Most of this functionality has been moved +to http://git.idk.i2p/idk/i2p.plugins.native which is more stable, +easier to build and use, and easier to incorporate into other +projects. It is the better option for nearly every non-Windows case +right now. You can get binary packages from: -target. + - https://github.com/eyedeekay/i2p.plugins.firefox/releases + +or look at + + - https://i2pgit.org/idk/i2p.plugins.firefox/-/blob/master/PACKAGES.md + +for instructions on how to build your own packages. These packages are +unofficial! Although I do dogfood most of them and the `.jar` gets thorough +testing. Issues ------ diff --git a/makefiles/app-profile.mk b/makefiles/app-profile.mk index ce793d0..e216222 100644 --- a/makefiles/app-profile.mk +++ b/makefiles/app-profile.mk @@ -1,4 +1,4 @@ -app-profile: .version build/app-profile/user.js build/app-profile/prefs.js build/app-profile/chrome/userChrome.css build/app-profile/storage-sync.sqlite +app-profile: .version build/app-profile/chrome/userChrome.css build/app-profile/storage-sync.sqlite app-profile.tgz: app-profile # $(eval PROFILE_VERSION := $(shell cat src/app-profile/version.txt)) @@ -7,5 +7,8 @@ app-profile.tgz: app-profile install -m755 src/unix/i2pconfig.sh build/app-profile/i2pconfig.sh cd build && tar -czf app-profile-$(PROFILE_VERSION).tgz app-profile && cp app-profile-$(PROFILE_VERSION).tgz ../ +build/app-profile/chrome/userChrome.css: build/app-profile/chrome src/app-profile/chrome/userChrome.css + cp src/app-profile/chrome/userChrome.css build/app-profile/chrome/userChrome.css + build/app-profile/storage-sync.sqlite: build/app-profile src/app-profile/storage-sync.sqlite cp src/app-profile/storage-sync.sqlite build/app-profile/storage-sync.sqlite diff --git a/makefiles/debian.mk b/makefiles/debian.mk index 0207815..0a8be2e 100644 --- a/makefiles/debian.mk +++ b/makefiles/debian.mk @@ -1,55 +1,4 @@ orig: tar --exclude=debian --exclude=.git -cvzf ../i2p-firefox-profile_$(PROFILE_VERSION).orig.tar.gz . -## HOWTO: If you need to release a package to launchpad, build for the oldest -## release launchpad supports(bionic AFIACT). Then, after the build is -## published, copy it to the other distributions. When bionic is out of date, -## update it to the new LTS. - -bionic: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bionic; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -focal: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) focal; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -groovy: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) groovy; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -buster: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) buster; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -bullseye: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) bullseye; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -trixie: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) trixie; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -sid: - @sed -i "s|`head -n 1 debian/changelog`|i2p-firefox-profile ($(PROFILE_VERSION)-1) sid; urgency=medium|g" debian/changelog - make orig - debuild -S - make dput - -dput: - dput --simulate --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes || exit - dput --force ppa:i2p-community/ppa ../i2p-firefox-profile_$(PROFILE_VERSION)-1_source.changes - -launchpad: bionic \ No newline at end of file +## HOWTO: Don't bother. See http://i2pgit.org/idk/i2p.plugins.firefox debian jpackages. diff --git a/makefiles/profile.mk b/makefiles/profile.mk index 7db1ecf..19604aa 100644 --- a/makefiles/profile.mk +++ b/makefiles/profile.mk @@ -1,5 +1,5 @@ -profile: build/profile/user.js build/profile/prefs.js build/profile/storage-sync.sqlite +profile: .version build/profile/storage-sync.sqlite profile.tgz: .version profile # $(eval PROFILE_VERSION := $(shell cat src/profile/version.txt)) diff --git a/src/app-profile/chrome/userChrome.css b/src/app-profile/chrome/userChrome.css index 4f1a013..0125083 100644 --- a/src/app-profile/chrome/userChrome.css +++ b/src/app-profile/chrome/userChrome.css @@ -1,26 +1,45 @@ +@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); + +/* only needed once */ -@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"); /* only needed once */ @namespace html url("http://www.w3.org/1999/xhtml"); - -#PersonalToolbar, #PanelUI-Button, #PanelUI-menu-button, #star-button, #forward-button, #home-button, #bookmarks-toolbar-button, #library-button, #sidebar-button, #pocket-button, #fxa-toolbar-menu-button, #reader-mode-button, #identity-icon { - visibility: collapse; +#PersonalToolbar, +#PanelUI-Button, +#PanelUI-menu-button, +#star-button, +#forward-button, +#home-button, +#bookmarks-toolbar-button, +#library-button, +#sidebar-button, +#pocket-button, +#fxa-toolbar-menu-button, +#reader-mode-button, +#identity-icon { + visibility: collapse; +} + +#urlbar-background { + background-color: black !important; } -#urlbar-background {background-color: black !important;} /* Remove back button circle */ + #back-button:not(:hover), -#back-button:not(:hover) > .toolbarbutton-icon { -background: transparent !important; -border: none !important; -box-shadow: none !important; +#back-button:not(:hover)>.toolbarbutton-icon { + background: transparent !important; + border: none !important; + box-shadow: none !important; } #back-button:hover, -#back-button:hover > .toolbarbutton-icon { -border: none !important; -border-radius: 2px !important; +#back-button:hover>.toolbarbutton-icon { + border: none !important; + border-radius: 2px !important; } -#urlbar-container, #nav-bar { visibility: collapse !important } -} +#urlbar-container, +#nav-bar { + visibility: collapse !important +} \ No newline at end of file