bump

Makefile

@@ -7,10 +7,10 @@ SNOW_VERSION=0.2.2
 UMAT_VERSION=1.25.2
 UBLO_VERSION=1.4.0
 NOSS_VERSION=11.0.23
-ZERO_VERSION=v1.16
+ZERO_VERSION=v1.17
 ZERO_VERSION_B=`echo $(ZERO_VERSION) | tr -d 'v.'`
-LAST_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).095
-LAUNCH_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).096
+LAST_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).097
+LAUNCH_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).098
 
 GO_COMPILER_OPTS = -a -tags netgo -ldflags '-w -extldflags "-static"'
 
@@ -116,14 +116,16 @@ upload-all: upload upload-variant
 release-all: release upload-all
 
 release-pure:
-	make pure
 	make release; true
-	make upload
+	make linux upload-linux
+	make windows upload-windows
+	make osx upload-darwin
 
 release-variant: 
-	make variant
 	make release; true
-	make upload-variant
+	make vlinux upload-variant-linux
+	make vwindows upload-variant-windows
+	make vosx upload-variant-darwin
 
 clean-release: clean release-pure release-variant
 

README.md

@@ -29,15 +29,15 @@ description.
 
 ```Bash
 # Linux
-wget -O i2pfirefox https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.096/i2pfirefox
+wget -O i2pfirefox https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox
 sha256sum i2pfirefox
 
 # Windows
-wget -O i2pfirefox.exe https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.096/i2pfirefox.exe
+wget -O i2pfirefox.exe https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox.exe
 does-windows-even-have-sha25sum i2pfirefox.exe
 
 # OSX
-wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.096/i2pfirefox-darwin
+wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox-darwin
 sha256sum i2pfirefox-darwin
 ```
 

go.mod

@@ -4,11 +4,11 @@ go 1.14
 
 require (
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb
+	github.com/eyedeekay/GingerShrew v0.0.0-20200823015403-11c67f550c33
 	github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e
 	github.com/eyedeekay/go-fpw v0.0.0-20200805184710-5435dc443213
 	github.com/eyedeekay/httptunnel v0.0.0-20200116022455-631ab90f707d
-	github.com/eyedeekay/zerobundle v0.0.0-20200822030320-56c6bd77f723
+	github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15
 	github.com/frankban/quicktest v1.4.0 // indirect
 	github.com/klauspost/compress v1.10.10 // indirect
 	github.com/klauspost/pgzip v1.2.4 // indirect

go.sum

@@ -105,6 +105,8 @@ github.com/elliotchance/orderedmap v1.2.0/go.mod h1:8hdSl6jmveQw8ScByd3AaNHNk51R
 github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw=
 github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb h1:tUfxSHBVabVBpX0Rcupybxr7pBfG2E+p3N7EX4p9sc0=
 github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb/go.mod h1:PY7znvZ1ZF1QG5/4j9u769EX49l49z2rCdE0o4z8fMw=
+github.com/eyedeekay/GingerShrew v0.0.0-20200823015403-11c67f550c33 h1:VD2HttHlFt6wfTjkbJMt/M/pmQT8Iq0I7CmEG81dwVM=
+github.com/eyedeekay/GingerShrew v0.0.0-20200823015403-11c67f550c33/go.mod h1:kDfSkqEyzswi8r4m6U0Q9jD4PJqOzKXVCX4XbYhBJCs=
 github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e h1:oEoiXkil4L/ahtVlljDwz5LXbE1qBsJqvC3/utNrKe4=
 github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e/go.mod h1:XchhjbeZKhEszN64SHavfaLGP2lFhWeO0ipH4cyBq5o=
 github.com/eyedeekay/checki2cp v0.0.15 h1:Vlwp9opuQJSgp139VVrLkKXRwLYYrXiBkqed35ZbqzY=
@@ -146,6 +148,10 @@ github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc h1:XWYtE6oKCk
 github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
 github.com/eyedeekay/zerobundle v0.0.0-20200822030320-56c6bd77f723 h1:WTWh03+SJxAlJtfNDXgMDwmu7yalSQcX/26EExGNCWo=
 github.com/eyedeekay/zerobundle v0.0.0-20200822030320-56c6bd77f723/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
+github.com/eyedeekay/zerobundle v0.0.0-20200822042922-d7ea80e6232b h1:8sLM7g5XwaWbcTM7CYqHCU7JGRiYSEmtVGpxUtgQ4qI=
+github.com/eyedeekay/zerobundle v0.0.0-20200822042922-d7ea80e6232b/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
+github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15 h1:o8btYu9FRR5xBnsRvpoX28ii4emNbLPZ5mx1+LUL37k=
+github.com/eyedeekay/zerobundle v0.0.0-20200822053838-bd4cc0b91c15/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
 github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200801165455-baeb0e58fc5a h1:YB1v+KkQusKKe7UjXIV2vI87okJXmBC7UHjnY6BkL04=
 github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
 github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200801165455-baeb0e58fc5a h1:tRCO7vRlUEBN/RxmUomwAlKQtZ6gtRoDMDyP2fravKI=

lib/firefox.go

@@ -14,6 +14,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	//	"strings"
 	"syscall"
 
 	. "github.com/eyedeekay/go-fpw"

main.go

@@ -19,7 +19,7 @@ import (
 	"runtime"
 	"time"
 
-	. "github.com/eyedeekay/GingerShrew/import"
+	"github.com/eyedeekay/GingerShrew/import"
 	. "github.com/eyedeekay/go-fpw"
 	. "github.com/eyedeekay/i2pbrowser/lib"
 	"github.com/eyedeekay/zerobundle"
@@ -87,10 +87,14 @@ func main() {
 	defer cancel()
 	if runtime.GOOS == "linux" {
 		if !*chromium {
-			if err := UnpackTBZ(GingerDir); err != nil {
-				log.Fatal("Error unpacking embedded browser")
-			} else {
-				os.Setenv("FIREFOX_BIN", filepath.Join(GingerDir, "gingershrew", "gingershrew"))
+			if os.Getenv("FIREFOX_BIN") == "" {
+				if err := gingershrew.UnpackTBZ(GingerDir); err != nil {
+					log.Fatal("Error unpacking embedded browser")
+				} else {
+					os.Setenv("LD_LIBRARY_PATH", filepath.Join(GingerDir, "x86_64-linux-gnu"))
+					log.Println("LD_LIBRARY_PATH", filepath.Join(GingerDir, "x86_64-linux-gnu"))
+					os.Setenv("FIREFOX_BIN", filepath.Join(GingerDir, "gingershrew", "gingershrew"))
+				}
 			}
 		}
 	} else {