update gs

Allow Firefox to break completely free of the Go app should the dev choose to do so
make it possible to just import it and use it in another app
2020-09-09 21:17:43 -04:00 · 2020-09-06 17:41:59 -04:00 · 2020-09-06 16:55:22 -04:00 · 2020-08-24 00:54:46 -04:00 · 2020-08-24 00:46:57 -04:00 · 2020-08-23 23:26:14 -04:00
12 changed files with 271 additions and 255 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,5 @@ i2pd/
 i2pd.tar.gz
 tunnels.conf
 .i2cp.conf
+basic/*
+tmp/*
--- a/74
+++ b/74
@@ -2,15 +2,17 @@
 export GO111MODULE=on
 GO111MODULE=on

+BIN_NAME=i2pbrowser
+
 EXT_VERSION=0.73
 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).094
-LAUNCH_VERSION=$(ZERO_VERSION_B).$(EXT_VERSION).095
+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"'

@@ -26,7 +28,7 @@ gen:
 	go run $(GO_COMPILER_OPTS) -tags generate gen.go extensions.go

 clean: fmt
-	rm -f i2pfirefox*
+	rm -f $(BIN_NAME)*

 fmt:
 	gofmt -w -s *.go
@@ -49,31 +51,31 @@ all: pure variant
 pure: fmt lib/assets.go windows osx linux

 windows: fmt
-	GOOS=windows go build $(GO_COMPILER_OPTS) -o i2pfirefox.exe
+	GOOS=windows go build $(GO_COMPILER_OPTS) -o $(BIN_NAME).exe

 osx: fmt
-	GOOS=darwin go build $(GO_COMPILER_OPTS) -o i2pfirefox-darwin
+	GOOS=darwin go build $(GO_COMPILER_OPTS) -o $(BIN_NAME)-darwin

 linux: fmt
-	GOOS=linux go build $(GO_COMPILER_OPTS) -o i2pfirefox
+	GOOS=linux go build $(GO_COMPILER_OPTS) -o $(BIN_NAME)

 variant: fmt lib/assets.go vwindows vosx vlinux

 vwindows: fmt
-	GOOS=windows go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant.exe
+	GOOS=windows go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant.exe

 vosx: fmt
-	GOOS=darwin go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant-darwin
+	GOOS=darwin go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant-darwin

 vlinux: fmt
-	GOOS=linux go build $(GO_COMPILER_OPTS) -tags variant -o i2pfirefox-variant
+	GOOS=linux go build $(GO_COMPILER_OPTS) -tags variant -o $(BIN_NAME)-variant

-sumwindows=`sha256sum i2pfirefox.exe`
-sumlinux=`sha256sum i2pfirefox`
-sumdarwin=`sha256sum i2pfirefox-darwin`
-sumvwindows=`sha256sum i2pfirefox-variant.exe`
-sumvlinux=`sha256sum i2pfirefox-variant`
-sumvdarwin=`sha256sum i2pfirefox-variant-darwin`
+sumwindows=`sha256sum $(BIN_NAME).exe`
+sumlinux=`sha256sum $(BIN_NAME)`
+sumdarwin=`sha256sum $(BIN_NAME)-darwin`
+sumvwindows=`sha256sum $(BIN_NAME)-variant.exe`
+sumvlinux=`sha256sum $(BIN_NAME)-variant`
+sumvdarwin=`sha256sum $(BIN_NAME)-variant-darwin`

 check:
 	echo "$(sumwindows)"
@@ -84,34 +86,48 @@ check:
 	echo "$(sumvdarwin)"

 release:
-	gothub release -p -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -n "Launchers" -d "A self-configuring launcher for mixed I2P and clearnet Browsing with Firefox"
+	gothub release -p -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -n "Launchers" -d "A self-configuring launcher for mixed I2P and clearnet Browsing with Firefox"
 	sed -i "s|$(LAST_VERSION)|$(LAUNCH_VERSION)|g" README.md
 	sed -i "s|$(LAST_VERSION)|$(LAUNCH_VERSION)|g" Makefile
 	git commit -am "Make release version $(LAUNCH_VERSION)" && git push

-upload:
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumwindows)" -n "i2pfirefox.exe" -f "i2pfirefox.exe"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumdarwin)" -n "i2pfirefox-darwin" -f "i2pfirefox-darwin"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumlinux)" -n "i2pfirefox" -f "i2pfirefox"
+upload: upload-windows upload-darwin upload-linux

-upload-variant:
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvwindows)" -n "i2pfirefox-variant.exe" -f "i2pfirefox-variant.exe"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvdarwin)" -n "i2pfirefox-variant-darwin" -f "i2pfirefox-variant-darwin"
-	gothub upload -R -u eyedeekay -r "i2pfirefox" -t $(LAUNCH_VERSION) -l "$(sumvlinux)" -n "i2pfirefox-variant" -f "i2pfirefox-variant"
+upload-windows:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumwindows)" -n "$(BIN_NAME).exe" -f "$(BIN_NAME).exe"
+
+upload-darwin:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumdarwin)" -n "$(BIN_NAME)-darwin" -f "$(BIN_NAME)-darwin"
+
+upload-linux:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumlinux)" -n "$(BIN_NAME)" -f "$(BIN_NAME)"
+
+upload-variant: upload-variant-windows upload-variant-darwin upload-variant-linux
+
+upload-variant-windows:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvwindows)" -n "$(BIN_NAME)-variant.exe" -f "$(BIN_NAME)-variant.exe"
+
+upload-variant-darwin:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvdarwin)" -n "$(BIN_NAME)-variant-darwin" -f "$(BIN_NAME)-variant-darwin"
+
+upload-variant-linux:
+	gothub upload -R -u eyedeekay -r "$(BIN_NAME)" -t $(LAUNCH_VERSION) -l "$(sumvlinux)" -n "$(BIN_NAME)-variant" -f "$(BIN_NAME)-variant"

 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

--- a/README.md
+++ b/README.md
@@ -29,15 +29,15 @@ description.

 ```Bash
 # Linux
-wget -O i2pfirefox https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.095/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.095/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.095/i2pfirefox-darwin
+wget -O i2pfirefox-darwin https://github.com/eyedeekay/i2pfirefox/releases/download/116.0.73.097/i2pfirefox-darwin
 sha256sum i2pfirefox-darwin
 ```

--- a/go.mod
+++ b/go.mod
@@ -3,17 +3,15 @@ module github.com/eyedeekay/i2pbrowser
 go 1.14

 require (
-	github.com/akavel/rsrc v0.9.0 // indirect
-	github.com/eyedeekay/GingerShrew v0.0.0-20200702210346-bb2ed34c11fb
+	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
+	github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa
 	github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802063209-8973270c836e
-	github.com/eyedeekay/checki2cp v0.0.17
-	github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a
 	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-20200821145537-e36dff8c7dfc
+	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
-	github.com/pierrec/lz4/v3 v3.3.2 // indirect
 	github.com/zserge/lorca v0.1.9
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381 // indirect
 )
--- a/go.sum
+++ b/go.sum
@@ -2,7 +2,6 @@ bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxo
 cloud.google.com/go v0.16.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-code.cloudfoundry.org/bytefmt v0.0.0-20190710193110-1eb035ffe2b6/go.mod h1:wN/zk7mhREp/oviagqUXY3EwuHhWyOvAdsn5Y4CzOrc=
 crawshaw.io/littleboss v0.0.0-20190317185602-8957d0aedcce/go.mod h1:TIbCAHgttUfOKudw59Il7Z0XIlitzo228/mtwMe4vPM=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w=
@@ -11,8 +10,6 @@ github.com/RoaringBitmap/roaring v0.4.18/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrX
 github.com/RoaringBitmap/roaring v0.4.21/go.mod h1:D0gp8kJQgE1A4LQ5wFLggQEyvDi06Mq5mKs52e1TwOo=
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
-github.com/akavel/rsrc v0.9.0 h1:HwUDC0+tMFWqN4D5G+o5siGD4oVsC3jn6zM8ocjc3nY=
-github.com/akavel/rsrc v0.9.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alexflint/go-arg v1.1.0/go.mod h1:3Rj4baqzWaGGmZA2+bVTV8zQOZEjBQAPBnL5xLT+ftY=
@@ -78,6 +75,8 @@ github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/benbjohnson/immutable v0.2.0/go.mod h1:uc6OHo6PN2++n98KHLxW8ef4W42ylHiQSENghE1ezxI=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4YnC6+E63dPcxHo2sUxDIu8g3QgEJdRY=
+github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps=
 github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e h1:2q8XPjAYhXX8H71AoAPdgBrCUA3HPhC4ax8XHrTsY6I=
 github.com/boreq/friendlyhash v0.0.0-20190522010448-1ca64b3ca69e/go.mod h1:y80zLCg0QS5u3fJKeF2rwpezcyZuCpZpbFcWv6Pn98w=
@@ -89,6 +88,7 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
 github.com/d5/tengo v1.24.3/go.mod h1:VhLq8Q2QFhCIJO3NhvM934qOThykMqJi9y9Siqd1ocQ=
 github.com/danfragoso/thdwb v0.0.0-20191106005607-18cfeb88e782/go.mod h1:IXu355OpbfEz78+tgu81vte3YA/MEWQKBu/dXod4NM0=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3ebgob9U8Nd0kOddGdZWjyMGR8Wziv+TBNwSE=
 github.com/dsnet/compress v0.0.1 h1:PlZu0n3Tuv04TzpfPbrnI0HW/YwodEXDS+oPKahKF0Q=
@@ -105,16 +105,14 @@ 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/I2P-Configuration-for-Chromium v0.0.0-20200802060059-8ed0bfff2fe9 h1:TPJAkbZebNUAoSLhhGKOI1u8y3R7f1yeLvcwgSohp/M=
-github.com/eyedeekay/I2P-Configuration-for-Chromium v0.0.0-20200802060059-8ed0bfff2fe9/go.mod h1:XchhjbeZKhEszN64SHavfaLGP2lFhWeO0ipH4cyBq5o=
+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/GingerShrew v0.0.0-20200824044622-7e8d465550e5 h1:vUDYV/R8RNo7cxVN4ftdrXa9zsGQ74Bot5E/LMndhv0=
+github.com/eyedeekay/GingerShrew v0.0.0-20200824044622-7e8d465550e5/go.mod h1:kDfSkqEyzswi8r4m6U0Q9jD4PJqOzKXVCX4XbYhBJCs=
+github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa h1:wqjB9kcYjAMrw92QxZnbAbdMsfF0FSPq9vsKx98XWrU=
+github.com/eyedeekay/GingerShrew v0.0.0-20200828154258-d799f84952aa/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.0-20200403213308-750ce7e6d81f h1:rpkO9pKHoNxoUAH2dY9gtIRt+vDCS3t2VUq5V7ZalXA=
-github.com/eyedeekay/checki2cp v0.0.0-20200403213308-750ce7e6d81f/go.mod h1:ZilEsKkjp1K0e9qfUUdrHnz8teb1LU70L8JQzNSQmO8=
-github.com/eyedeekay/checki2cp v0.0.12 h1:ytAlEx0w928H6pE4IPDVuRsRQjJ30wUjhR0sLIGlOH0=
-github.com/eyedeekay/checki2cp v0.0.12/go.mod h1:ZilEsKkjp1K0e9qfUUdrHnz8teb1LU70L8JQzNSQmO8=
-github.com/eyedeekay/checki2cp v0.0.13 h1:lSOtS7LzInJIPrMbBkoLhlQHloRFMx0u5nFaQl2pDrI=
-github.com/eyedeekay/checki2cp v0.0.13/go.mod h1:3dCAyHmQ0WRd6xsBpL/W62gTcXU4P3kWfigrjeDZpAQ=
 github.com/eyedeekay/checki2cp v0.0.15 h1:Vlwp9opuQJSgp139VVrLkKXRwLYYrXiBkqed35ZbqzY=
 github.com/eyedeekay/checki2cp v0.0.15/go.mod h1:3dCAyHmQ0WRd6xsBpL/W62gTcXU4P3kWfigrjeDZpAQ=
 github.com/eyedeekay/checki2cp v0.0.17 h1:md/CZMugwVrdkppReKoRmrkpELE1qE8gIlSFD8EuYlk=
@@ -122,12 +120,6 @@ github.com/eyedeekay/checki2cp v0.0.17/go.mod h1:kdHq1LqZxi2qarfyospSHrh4Aju5Syd
 github.com/eyedeekay/eephttpd v0.0.0-20190903000420-52f5a8485a4e/go.mod h1:wFPQsNBnY95LkuujFEZARo7slafRwoF0D97FFHBoZro=
 github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a h1:zPI9ngyid7Wr92EHYanSOee6z0rWSlyKPt1nnOmZCu4=
 github.com/eyedeekay/go-ccw v0.0.0-20200403222455-d0e01222fd2a/go.mod h1:k3EtNXTNE8UHnYqq/Ny7QiVPZIFtdiCuckEPT0qkR14=
-github.com/eyedeekay/go-fpw v0.0.0-20200403201858-3d24733073ff h1:nmfiBxYeXYnUUB7sYoez7VT7mB99hFeHeZtXE69ot9A=
-github.com/eyedeekay/go-fpw v0.0.0-20200403201858-3d24733073ff/go.mod h1:F4d0cXDXTK6ZsAnxmATan3VyDV4k9P9ciCGRKt/fVik=
-github.com/eyedeekay/go-fpw v0.0.0-20200404005604-8ccf7dc81580 h1:Eo210WM4t+DLJ5rBmj1fnUAuCEM614zIvVUO7RIeTRw=
-github.com/eyedeekay/go-fpw v0.0.0-20200404005604-8ccf7dc81580/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
-github.com/eyedeekay/go-fpw v0.0.0-20200512000155-818dd5b71e7a h1:Hiv9cEmUjhUbHNzF9l8XyyYGskXFIGs0KJvcxGrzQik=
-github.com/eyedeekay/go-fpw v0.0.0-20200512000155-818dd5b71e7a/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
 github.com/eyedeekay/go-fpw v0.0.0-20200512022837-c8b4dcdc74d4 h1:fZggjpJu/JsYTCn1BjT1SICuEcab8Cyvz3BwI9aDIUw=
 github.com/eyedeekay/go-fpw v0.0.0-20200512022837-c8b4dcdc74d4/go.mod h1:RyCx7KuH+5ryvIpUF7SpxiChLtjeuPbVFCIzf8shIFc=
 github.com/eyedeekay/go-fpw v0.0.0-20200805184710-5435dc443213 h1:QhukeK1UqJLWe6UT/rMnPppdXkLiYDyzOiZ7YAYt6bA=
@@ -156,112 +148,36 @@ github.com/eyedeekay/sam3 v0.0.0-20190613034117-99ad6522ebe3/go.mod h1:Vrxh+71E3
 github.com/eyedeekay/sam3 v0.0.0-20190730185140-f8d54526ea25/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=
 github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s=
 github.com/eyedeekay/sam3 v0.32.2/go.mod h1:Y3igFVzN4ybqkkpfUWULGhw7WRp8lieq0ORXbLBbcZM=
-github.com/eyedeekay/zerobundle v0.0.0-20200729053534-6fdefaab976b h1:o3AMSGxze29dkXAs7bjFTNg/wO1SR29aH9+DLg1Q3Ys=
-github.com/eyedeekay/zerobundle v0.0.0-20200729142507-09254e0fcd4a h1:DP3ZHtWFnq15iGkQ/NAskdxTwyUNhU/TQYGof2FytiQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:wSZgKbze5193l1gvlEMGmC2T9BSmfK/ZFx+w7GpPScE=
-github.com/eyedeekay/zerobundle v0.0.0-20200729232301-a53636329828 h1:ID7+uAh7hFjYhsnENytlvQToWBQjh0L7rzQn/4Iv7OQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200729232301-a53636329828/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801013618-d7f06aa455d4 h1:fsSYcXnqPTvP8mRGDaxDF1U3fzRwiiegbYyh56TnuFQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200801013618-d7f06aa455d4/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801044052-02d339203f7c h1:ilkSjOMPWMjjeYuCLOeGq3a7pVlSzcZndNC6XjAOp2g=
-github.com/eyedeekay/zerobundle v0.0.0-20200801044052-02d339203f7c/go.mod h1:mFi4fRolEjIWy0BYMrlrBzoXsUM8NbwwGXNQnbtAh6Q=
-github.com/eyedeekay/zerobundle v0.0.0-20200801171255-e52955df6c06 h1:RMPN939tthCSPX339wS+nLYwZu/CFfJ6ZQ0seFnThbg=
-github.com/eyedeekay/zerobundle v0.0.0-20200801171255-e52955df6c06/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802020224-4ecb0983fab2 h1:34h7sCyBIqL5TbxPJy7LGUrpKUb8s/Db3gJBfd49eJk=
-github.com/eyedeekay/zerobundle v0.0.0-20200802020224-4ecb0983fab2/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802032933-4aae53e45577 h1:aVjc4ct7XsrPXy4RGCntjg+Mp+DucCU6VjTh48W84GQ=
-github.com/eyedeekay/zerobundle v0.0.0-20200802032933-4aae53e45577/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802035941-c66d7eb01340 h1:PaMh/zhViPFXIeJ4sMkRPPBDCuIEGeUaHO0eLNosT98=
-github.com/eyedeekay/zerobundle v0.0.0-20200802035941-c66d7eb01340/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802064839-ff08f711c3f9 h1:ROVKA3xcRXkmgHaNoq/6xJgSZYSo8bzkXF3q1K6j9Wg=
-github.com/eyedeekay/zerobundle v0.0.0-20200802064839-ff08f711c3f9/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200802224726-ade60064998c h1:vne+x6MOOLls+wxN23VaJ3qgF8Qq3vdebK4OkpOlxIM=
-github.com/eyedeekay/zerobundle v0.0.0-20200802224726-ade60064998c/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200803002433-d08cdaba1810 h1:09MAije/deFIkcARbMKbAIG3IH2puZjLG5OV45y+F+I=
-github.com/eyedeekay/zerobundle v0.0.0-20200803002433-d08cdaba1810/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200804040541-f28536b381d0 h1:mP6OZ7FpPbkG6u7RqDxiDcLkRRGivsno2JWAgiwucfU=
-github.com/eyedeekay/zerobundle v0.0.0-20200804040541-f28536b381d0/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200813021423-64390e2d8eb7 h1:ffrOxr5Nj5rRalPef2fTcInX5aUmhVF6NpJROrtdyZo=
-github.com/eyedeekay/zerobundle v0.0.0-20200813021423-64390e2d8eb7/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200814211506-dd4d554fc2ea h1:opAd1HJ4Ep7DgwZO8N7xyDVbymeWXR5H7vHJF3a5/Ww=
-github.com/eyedeekay/zerobundle v0.0.0-20200814211506-dd4d554fc2ea/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200821134835-a6c85af5d341 h1:yFCj/q/9bGeQemswLmBz2HAGYbaQEx7yNGnsI+2N2fo=
-github.com/eyedeekay/zerobundle v0.0.0-20200821134835-a6c85af5d341/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle v0.0.0-20200821141551-e6179de084e0 h1:F+J9DEM5F3CoZP2hvRv3Ue9ZQruyyPl7xBIhAxXKfus=
-github.com/eyedeekay/zerobundle v0.0.0-20200821141551-e6179de084e0/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
 github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc h1:XWYtE6oKCk1sR6phdDSE9RkxDPP4YcHm+/clAK1JuQg=
 github.com/eyedeekay/zerobundle v0.0.0-20200821145537-e36dff8c7dfc/go.mod h1:J4pHO/M5C5c5kD2nwCHuJc06i0mkOjSwIurnj7fVIPY=
-github.com/eyedeekay/zerobundle/parts v0.0.0-20200729142507-09254e0fcd4a h1:kS2ZOf/ZiHnV+JL/V5yxr4I9qDLSvKXBjmHUm/xCPRM=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729142507-09254e0fcd4a h1:SCBVcTjxLI1idb/Idgf3WJN9FdKKnnauoJCd8QRfMVE=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729225350-f5800a7c3c3f h1:82utnE2TpNxCQRNWclzglpdNvug0MHZxvHjzLTbnRdA=
-github.com/eyedeekay/zerobundle/parts/aa v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:tVoCDPZqyc9Q5NKmU7m9jMHCFLuDhurZPsnnzv89pGE=
+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-20200729142507-09254e0fcd4a h1:1DgXjWc4ZXTnC4WGsHY8HAA8QdCrB67+/nZGXTQbIr4=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:NKlWiAbDc3kJWP/G6OhSrqslLlslDCdv7nKoU0GTyxo=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729225350-f5800a7c3c3f h1:swREl2GOW6U1U+RNJfOXWeiKV29yFXKmGCJoKtfRAvU=
-github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:NKlWiAbDc3kJWP/G6OhSrqslLlslDCdv7nKoU0GTyxo=
 github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200801165455-baeb0e58fc5a h1:tRCO7vRlUEBN/RxmUomwAlKQtZ6gtRoDMDyP2fravKI=
 github.com/eyedeekay/zerobundle/parts/ab v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:aCWmPFXSHktdhMDHyIxJovmz23UfaQteyh9p7NEMdqk=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729142507-09254e0fcd4a h1:rwMHSafcl+31LFgF3ISBWsDwdpn3bjBir2Ro+61c7ow=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:AuRFy8afdHaiMGYwzYHe5y/zMhR4jAmlVp1pkHnpqK8=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729225350-f5800a7c3c3f h1:cEHhuCYuI0RUPpCnCL5J6TEJ1HFE/+xZUr9Npu/fn3E=
-github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:AuRFy8afdHaiMGYwzYHe5y/zMhR4jAmlVp1pkHnpqK8=
 github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200801165455-baeb0e58fc5a h1:I9cfKFBva/vELjboNMnziXs3yBWAP4efOvpk/2BxRq0=
 github.com/eyedeekay/zerobundle/parts/ac v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:E8Mmkic2QrlcHaV75Hjne8f88lDpLNa/x96WEGcdHvA=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729142507-09254e0fcd4a h1:DcnJHPJytYcO3wJuNJsg8mHRh1n1EMbxCNfbdavs0Dc=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:62U7cYEvzk7Ifxw/Ar5v4IuJhIk0tmmtBXzfQ9wvYZk=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729225350-f5800a7c3c3f h1:CF7HMHXP5DOnrXjX4qvUAA1L4duZXiebkUzXls+rGzA=
-github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:62U7cYEvzk7Ifxw/Ar5v4IuJhIk0tmmtBXzfQ9wvYZk=
 github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200801165455-baeb0e58fc5a h1:IKvjrgUqsAFv53gIC8XsanV+tO9m0DbH/qq3yJHmkYU=
 github.com/eyedeekay/zerobundle/parts/ad v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:arirCFNWdkg3MySrwkP6kn6iVe2CckYxe8G+hnJRt1E=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729142507-09254e0fcd4a h1:bdiHNCtlUCTTxRD2dx7Na/Rihl4KFZ3pSKKcAFNvQlU=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:MKLWNSl5M4lATW82deXgDyqtLXwkef8qLgQi32iUios=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729225350-f5800a7c3c3f h1:pcG8Ij6x7p2Ipohwx4xhs5s6cOIIjKyW9F0x6HZXJVE=
-github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:MKLWNSl5M4lATW82deXgDyqtLXwkef8qLgQi32iUios=
 github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200801165455-baeb0e58fc5a h1:03H21zmL6cvAn5SON3+pq1Xn15zpnaYWONItSWO8Arg=
 github.com/eyedeekay/zerobundle/parts/ae v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:5SG9xD0lwrshQ9vddGUMRhhOg5ckglhFWnuRGCX2oA0=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729142507-09254e0fcd4a h1:ISq9LKIkHsiJBko6QwXlxAO8Fzsxdphip/yWQ0X+FMQ=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:LpDs3WuJeg+W2ovaaaV/zki2+qUw1u8kivAkBrYNn3Y=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729225350-f5800a7c3c3f h1:A0BCGzmYiI7j+0xnznR/oBUd9tlPBxzHbEoC5s6Xz8o=
-github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:LpDs3WuJeg+W2ovaaaV/zki2+qUw1u8kivAkBrYNn3Y=
 github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200801165455-baeb0e58fc5a h1:Tkgc2GkvJxTzt89jeN9vXFRCgYhLgj3l+QFMnXbLiHE=
 github.com/eyedeekay/zerobundle/parts/af v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:qdc81OrWUMbHJh5p6AwnHm/byMu5F37TZ77BL2UuJco=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729142507-09254e0fcd4a h1:g3WOL17K3aWxOaAKp9eg3tgRN54P2YyBpdWFRSfIdDQ=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:F0f897NnR0kBLV6zRIEHp7lhHYzBo2QNG6RhSsm0j8g=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729225350-f5800a7c3c3f h1:HY02d4xi0ikUNOrbbIR+ZL7EgGvIqQHfOztCFa+l2PY=
-github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:F0f897NnR0kBLV6zRIEHp7lhHYzBo2QNG6RhSsm0j8g=
 github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200801165455-baeb0e58fc5a h1:r7vfoe6N3yuZHH0FO2jA8aUAj7C4b9QupBDMCPIFqgw=
 github.com/eyedeekay/zerobundle/parts/ag v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:jwWe41RVcOY1vPhdC+k6h5WGI6Zy4AjiyZgioOoglGo=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729142507-09254e0fcd4a h1:Fa6fCH5UJCBEZEvCHNM7mAVH1/XkUkEeD/TyYbeRcyA=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:LQQiw6dlpSNb9vQFLHqOWUSGsNuPulqet/gLzgntWKk=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729225350-f5800a7c3c3f h1:iTjw3qHSXRs4s6v21eKw5TFBn/jamxivITVUnld/TWQ=
-github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:LQQiw6dlpSNb9vQFLHqOWUSGsNuPulqet/gLzgntWKk=
 github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200801165455-baeb0e58fc5a h1:Jfu5QObHI0BLhKi9Hudu1MTjfLuccyC6a8WtrVSh1N4=
 github.com/eyedeekay/zerobundle/parts/ah v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:dlc63NsWSrDaqa85np61lWEiobbpP/4qhtm/4S4gnZQ=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729142507-09254e0fcd4a h1:T4Cm1uKjtDU4Fly9vaPvOY4sf6VVkaERQhvyALnVnBw=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:HD5UclEN5RPgVQ2Ba/RdNWhtQ1d12Gx72CKksezEdhc=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729225350-f5800a7c3c3f h1:OiWtQwfYKwrXJRXdaug/KZ49wKRpfCWQA6trHpo57Oo=
-github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:HD5UclEN5RPgVQ2Ba/RdNWhtQ1d12Gx72CKksezEdhc=
 github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200801165455-baeb0e58fc5a h1:LP1ZIS5T4drVnKunx/jTsS5ehaEqs0YW6ypJKPfKaVQ=
 github.com/eyedeekay/zerobundle/parts/ai v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:UWWZyb/ESoEsNduVilUxMj4DJ2kn8ldJL5E2gy2IPV8=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729142507-09254e0fcd4a h1:AITYqhm/b9RCxeCvRWFx8lu2Ds8FeII63hbNF7JvnIM=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:oX+vQpNrt5jVdJwdFD+kVMDNfYpRNCB8E8me6xOrqos=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729225350-f5800a7c3c3f h1:jkwvPJhQg1SBE65G4D905Cjvl6uRIkM0UhowGzRo+LE=
-github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:oX+vQpNrt5jVdJwdFD+kVMDNfYpRNCB8E8me6xOrqos=
 github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200801165455-baeb0e58fc5a h1:sQq48QEVd4AJ0jdA+fpPG/7eSn6G3LK9v53YOA01omg=
 github.com/eyedeekay/zerobundle/parts/aj v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:PTleyTXt8iqQtqp00m7DojOP/O9CD4B0ep5zTHJxiCc=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729142507-09254e0fcd4a h1:+aFtyD7v1mfjtuqdBDwPV0wA31GSB3l+BSkYL3l1xZk=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:uUp6ltyxP5+9AD4A+ythEBdkglMRkhgGV8SM+eXZqTw=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729225350-f5800a7c3c3f h1:jqfyCNiR8ZsYrtzBMrJeNRPzxshV2NRo2a1KX5SQ52A=
-github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:uUp6ltyxP5+9AD4A+ythEBdkglMRkhgGV8SM+eXZqTw=
 github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200801165455-baeb0e58fc5a h1:7cERcjt6rArcqrL2I36LN/wYF/gWFH3r8pCOL/Ytmxk=
 github.com/eyedeekay/zerobundle/parts/ak v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:3hUQinkmOKFMCBur/VjKTMSsFU9Q5R6vpDttyLpXDTA=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729142507-09254e0fcd4a h1:h+8wlDouDmrZW2NZwRy5UaHAewkZps4KYpJs5bZljo0=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729142507-09254e0fcd4a/go.mod h1:lZDRMeWc47sspGEW0wOGtUqEh+WWA2z5GGTCEFgddVI=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729225350-f5800a7c3c3f h1:b1OxCdkxZq3altokLgnTImPGwUwIwdASUlkKGRoYAe4=
-github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200729225350-f5800a7c3c3f/go.mod h1:lZDRMeWc47sspGEW0wOGtUqEh+WWA2z5GGTCEFgddVI=
 github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200801165455-baeb0e58fc5a h1:Un1Yacddsyd8zF8ZhOn4BltbjqLcXIfhBc6xo6lHcpU=
 github.com/eyedeekay/zerobundle/parts/al v0.0.0-20200801165455-baeb0e58fc5a/go.mod h1:9FNKW4YG3sCm/UyMa4ZpYUJFA4K1xdMXN0bl7xwt5HE=
 github.com/frankban/quicktest v1.4.0 h1:rCSCih1FnSWJEel/eub9wclBSqpF2F/PuvxUWGWnbO8=
@@ -372,7 +288,6 @@ github.com/mholt/archiver v3.1.1+incompatible h1:1dCVxuqs0dJseYEhi5pl7MYPH9zDa1w
 github.com/mholt/archiver v3.1.1+incompatible/go.mod h1:Dh2dOXnSdiLxRiPoVfIr/fI1TwETms9B8CTWfeh7ROU=
 github.com/mholt/archiver/v3 v3.3.0 h1:vWjhY8SQp5yzM9P6OJ/eZEkmi3UAbRrxCq48MxjAzig=
 github.com/mholt/archiver/v3 v3.3.0/go.mod h1:YnQtqsp+94Rwd0D/rk5cnLrxusUBUXg+08Ebtr1Mqao=
-github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db/go.mod h1:l0dey0ia/Uv7NcFFVbCLtqEBQbrT4OCwCSKTEv6enCw=
 github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -383,24 +298,19 @@ github.com/nwaples/rardecode v1.1.0 h1:vSxaY8vQhOcVr4mm5e8XllHWTiM4JF507A0Katqw7
 github.com/nwaples/rardecode v1.1.0/go.mod h1:5DzqNKiOdpKKBH87u8VlvAnPZMXcGRhxWkRpHbbfGS0=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
-github.com/onsi/ginkgo v1.8.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
-github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/pelletier/go-toml v1.0.1-0.20170904195809-1d6b12b7cb29/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2 h1:JhzVVoYvbOACxoUmOs6V/G4D5nPVUW73rKvXxP4XUJc=
 github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2/go.mod h1:iIss55rKnNBTvrwdmkUpLnDpZoAHvWaiq5+iMmen4AE=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
-github.com/pierrec/cmdflag v0.0.2/go.mod h1:a3zKGZ3cdQUfxjd0RGMLZr8xI3nvpJOB+m6o/1X5BmU=
-github.com/pierrec/lz4 v1.0.1 h1:w6GMGWSsCI04fTM8wQRdnW74MuJISakuUU0onU0TYB4=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI=
 github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
-github.com/pierrec/lz4/v3 v3.3.2 h1:QTUOCbMNDbK4PYtkuHyOBd28C0UhPBw3T4OH4WpFDik=
-github.com/pierrec/lz4/v3 v3.3.2/go.mod h1:280XNCGS8jAcG++AHdd6SeWnzyJ1w9oow2vbORyey8Q=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3-0.20190127221311-3c4408c8b829/go.mod h1:p2iRAGwDERtqlqzRXnrOVns+ignqQo//hLXqYxZYVNs=
@@ -411,7 +321,6 @@ github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R
 github.com/prometheus/procfs v0.0.0-20190117184657-bf6a532e95b1/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4=
 github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
-github.com/schollz/progressbar/v2 v2.13.2/go.mod h1:6YZjqdthH6SCZKv2rqGryrxPtfmRB/DWZxSMfCXPyD8=
 github.com/sger/go-hashdir v0.0.1 h1:ii/IIGYNJCpvSqTV63LbfASPpQqazRRS9ErvmBAUNw0=
 github.com/sger/go-hashdir v0.0.1/go.mod h1:LmCpMSJQKVSNBt2rFKz/upjHTGfwNxn5MAmIAUd4qXg=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
@@ -434,6 +343,7 @@ github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXf
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1 h1:nOGnQDM7FYENwehXlg/kFVnos3rEvtKTjRvOWSzb6H4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M=
 github.com/tfriedel6/canvas v0.9.2/go.mod h1:O1YsCm9agdCl48M82l/1tUszUh1nR5zfpLcHxM5D7Cw=
@@ -454,9 +364,6 @@ github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMx
 github.com/ybbus/jsonrpc v2.1.2+incompatible/go.mod h1:XJrh1eMSzdIYFbM08flv0wp5G35eRniyeGut1z+LSiE=
 github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26 h1:E0lEWrifmR0ACbGf5PLji1XbW6rtIXLHCXO/YOqi0AE=
 github.com/zieckey/goini v0.0.0-20180118150432-0da17d361d26/go.mod h1:TQpdgg7I9+PFIkatlx/dnZyZb4iZyCUx1HJj4rXi3+E=
-github.com/zserge/lorca v0.1.8/go.mod h1:gTrVdXKyWxNhc8aUb1Uu3s0mY343arR1T6jUtxmBxR8=
-github.com/zserge/lorca v0.1.9 h1:vbDdkqdp2/rmeg8GlyCewY2X8Z+b0s7BqWyIQL/gakc=
-github.com/zserge/lorca v0.1.9/go.mod h1:bVmnIbIRlOcoV285KIRSe4bUABKi7R7384Ycuum6e4A=
 github.com/zserge/webview v0.0.0-20190123072648-16c93bcaeaeb/go.mod h1:a1CV8KR4Dd1eP2g+mEijGOp+HKczwdKHWyx0aPHKvo4=
 gitlab.com/golang-commonmark/html v0.0.0-20180917080848-cfaf75183c4a/go.mod h1:JT4uoTz0tfPoyVH88GZoWDNm5NHJI2VbUW+eyPClueI=
 gitlab.com/golang-commonmark/linkify v0.0.0-20180917065525-c22b7bdb1179/go.mod h1:Gn+LZmCrhPECMD3SOKlE+BOHwhOYD9j7WT9NUtkCrC8=
@@ -485,7 +392,6 @@ golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73r
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
-golang.org/x/net v0.0.0-20181102091132-c10e9556a7bc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190125091013-d26f9f9a57f3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -529,6 +435,7 @@ golang.org/x/sys v0.0.0-20191105231009-c1f44814a5cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191126131656-8a8471f7e56d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd h1:xhmwyvizuTgC2qz7ZlMluP20uW+C3Rm0FD/WLDX8884=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -560,11 +467,13 @@ google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZi
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.7 h1:VUgggvou5XRW9mHwD/yXxIYSMtY0zoKQf/v226p2nyo=
 gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/import/chromium.go
+++ b/import/chromium.go
@@ -1,4 +1,4 @@
-package main
+package i2pbrowser

 /*
 Released under the The MIT License (MIT)
--- a/import/extensions.go
+++ b/import/extensions.go
@@ -1,6 +1,6 @@
 //+build generate

-package main
+package i2pbrowser

 /*
 Released under the The MIT License (MIT)
--- a/import/firefox.go
+++ b/import/firefox.go
@@ -1,4 +1,4 @@
-package main
+package i2pbrowser

 /*
 Released under the The MIT License (MIT)
@@ -10,3 +10,7 @@ import "github.com/eyedeekay/i2pbrowser/lib"
 func firefoxMain() {
 	i2pfirefox.FirefoxMain()
 }
+
+func firefoxLaunch() {
+	i2pfirefox.FirefoxLaunch()
+}
--- a/import/httptunnel.go
+++ b/import/httptunnel.go
@@ -1,4 +1,4 @@
-package main
+package i2pbrowser

 /*
 Released under the The MIT License (MIT)
--- a/import/import.go
+++ b/import/import.go
@@ -0,0 +1,142 @@
+//go:generate go run -tags generate gen.go extensions.go
+
+/*
+Released under the The MIT License (MIT)
+see ./LICENSE
+*/
+
+package i2pbrowser
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"log"
+	"net"
+	"net/http"
+	"os"
+	"path/filepath"
+	"runtime"
+	"time"
+
+	"github.com/eyedeekay/GingerShrew/import"
+	. "github.com/eyedeekay/go-fpw"
+	. "github.com/eyedeekay/i2pbrowser/lib"
+	"github.com/eyedeekay/zerobundle"
+)
+
+type handler struct {
+}
+
+func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
+	fmt.Fprintf(w, "hello\n")
+	/*In the future, we may use this as a sort of loopback for privately testing the browser
+	fingerprint. At first this will be 100% user-initiated, but it may be useful to query such
+	a service periodically, in order to inform the user when a fingerprint change has occurred
+	and prompt them to potentially re-set their browser to it's original state.
+	for name, headers := range req.Header {
+		for _, h := range headers {
+			fmt.Fprintf(w, "%v: %v\n", name, h)
+		}
+	}*/
+}
+
+func hello() error {
+	server := &http.Server{Addr: "localhost:", Handler: &handler{}}
+
+	go func() {
+		if err := server.ListenAndServe(); err != nil {
+			log.Println(err)
+		}
+	}()
+
+	// Setting up signal capturing
+	//    stop := make(chan os.Signal, 1)
+	//    signal.Notify(stop, os.Interrupt)
+
+	// Waiting for SIGINT (pkill -2)
+	//    <-stop
+
+	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+	defer cancel()
+	if err := server.Shutdown(ctx); err != nil {
+		log.Println(err)
+	}
+	return nil
+}
+
+func proxyCheck() bool {
+	conn, err := net.Dial("tcp4", "localhost:4444")
+	log.Println("Doing dial check")
+	if err != nil {
+		return false
+	}
+	log.Println("Dial check true, proxy is up")
+	defer conn.Close()
+	return true
+}
+
+func Main() {
+	if err := hello(); err != nil {
+		log.Fatal(err)
+	}
+	chromium := flag.Bool("chromium", false, "use a chromium-based browser instead of a firefox-based browser.")
+	flag.Parse()
+	ARGS = append(ARGS, flag.Args()...)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+	if runtime.GOOS == "linux" {
+		if !*chromium {
+			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, "lib/x86_64-linux-gnu")+","+filepath.Join(GingerDir, "usr/lib/x86_64-linux-gnu"))
+					log.Println("LD_LIBRARY_PATH", filepath.Join(GingerDir, "lib/x86_64-linux-gnu")+","+filepath.Join(GingerDir, "usr/lib/x86_64-linux-gnu"))
+					os.Setenv("FIREFOX_BIN", filepath.Join(GingerDir, "gingershrew", "gingershrew"))
+				}
+			}
+		}
+	} else {
+		if LocateFirefox() == "" {
+			*chromium = true
+		}
+	}
+	if err := WriteI2CPConf(); err != nil {
+		log.Println(err)
+	}
+	if err := zerobundle.ZeroMain(); err != nil {
+		log.Println(err)
+	}
+	time.Sleep(time.Second * 2)
+	if !proxyCheck() {
+		go proxyMain(ctx)
+	}
+	if !*chromium {
+		firefoxMain()
+	} else {
+		chromiumMain()
+	}
+}
+
+func MainNoEmbeddedStuff() {
+	if err := hello(); err != nil {
+		log.Fatal(err)
+	}
+	chromium := false
+	ARGS = append(ARGS, flag.Args()...)
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
+	if LocateFirefox() == "" {
+		chromium = true
+	}
+	if !proxyCheck() {
+		go proxyMain(ctx)
+	}
+	if !chromium {
+		firefoxLaunch()
+	} else {
+		chromiumMain()
+	}
+}
--- a/lib/firefox.go
+++ b/lib/firefox.go
@@ -14,6 +14,7 @@ import (
 	"os"
 	"os/signal"
 	"path/filepath"
+	//	"strings"
 	"syscall"

 	. "github.com/eyedeekay/go-fpw"
@@ -91,6 +92,50 @@ func WriteProfile(FS *fs) bool {
 	return firstrun
 }

+func FirefoxLaunch() {
+	firstrun := WriteProfile(FS)
+	prefs := filepath.Join(UserDir, "/user.js")
+	if _, err := os.Stat(prefs); os.IsNotExist(err) {
+		if err := ioutil.WriteFile(prefs, []byte(PREFS), 0644); err == nil {
+			log.Println("wrote", prefs)
+		} else {
+			log.Fatal(err)
+		}
+	}
+	if firstrun {
+		_, ERROR := SecureExtendedFirefox(UserDir, false, EXTENSIONS, EXTENSIONHASHES, ARGS...)
+		if ERROR != nil {
+			log.Fatal(ERROR)
+		}
+		//		defer FIREFOX.Close()
+		//<-FIREFOX.Done()
+	} else {
+		_, ERROR := BasicFirefox(UserDir, false, ARGS...)
+		if ERROR != nil {
+			log.Fatal(ERROR)
+		}
+		//<-FIREFOX.Done()
+		//		defer FIREFOX.Close()
+
+		/*		sigs := make(chan os.Signal, 1)
+				done := make(chan bool, 1)
+
+				signal.Notify(sigs, syscall.SIGINT, syscall.SIGTERM)
+
+				go func() {
+					sig := <-sigs
+					fmt.Println()
+					fmt.Println(sig)
+					done <- true
+				}()
+
+				fmt.Println("awaiting signal")
+				<-done
+				fmt.Println("exiting")
+				<-FIREFOX.Done()*/
+	}
+}
+
 func FirefoxMain() {
 	firstrun := WriteProfile(FS)
 	prefs := filepath.Join(UserDir, "/user.js")
--- a/main.go
+++ b/main.go
@@ -8,109 +8,9 @@ see ./LICENSE
 package main

 import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
-
-	. "github.com/eyedeekay/GingerShrew/import"
-	. "github.com/eyedeekay/go-fpw"
-	. "github.com/eyedeekay/i2pbrowser/lib"
-	"github.com/eyedeekay/zerobundle"
+	. "github.com/eyedeekay/i2pbrowser/import"
 )

-type handler struct {
-}
-
-func (h *handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	fmt.Fprintf(w, "hello\n")
-	/*In the future, we may use this as a sort of loopback for privately testing the browser
-	fingerprint. At first this will be 100% user-initiated, but it may be useful to query such
-	a service periodically, in order to inform the user when a fingerprint change has occurred
-	and prompt them to potentially re-set their browser to it's original state.
-	for name, headers := range req.Header {
-		for _, h := range headers {
-			fmt.Fprintf(w, "%v: %v\n", name, h)
-		}
-	}*/
-}
-
-func hello() error {
-	server := &http.Server{Addr: "localhost:", Handler: &handler{}}
-
-	go func() {
-		if err := server.ListenAndServe(); err != nil {
-			log.Println(err)
-		}
-	}()
-
-	// Setting up signal capturing
-	//    stop := make(chan os.Signal, 1)
-	//    signal.Notify(stop, os.Interrupt)
-
-	// Waiting for SIGINT (pkill -2)
-	//    <-stop
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	if err := server.Shutdown(ctx); err != nil {
-		log.Println(err)
-	}
-	return nil
-}
-
-func proxyCheck() bool {
-	conn, err := net.Dial("tcp4", "localhost:4444")
-	log.Println("Doing dial check")
-	if err != nil {
-		return false
-	}
-	log.Println("Dial check true, proxy is up")
-	defer conn.Close()
-	return true
-}
-
 func main() {
-	if err := hello(); err != nil {
-		log.Fatal(err)
-	}
-	chromium := flag.Bool("chromium", false, "use a chromium-based browser instead of a firefox-based browser.")
-	flag.Parse()
-	ARGS = append(ARGS, flag.Args()...)
-	ctx, cancel := context.WithCancel(context.Background())
-	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"))
-			}
-		}
-	} else {
-		if LocateFirefox() == "" {
-			*chromium = true
-		}
-	}
-	if err := WriteI2CPConf(); err != nil {
-		log.Println(err)
-	}
-	if err := zerobundle.ZeroMain(); err != nil {
-		log.Println(err)
-	}
-	time.Sleep(time.Second * 2)
-	if !proxyCheck() {
-		go proxyMain(ctx)
-	}
-	if !*chromium {
-		firefoxMain()
-	} else {
-		chromiumMain()
-	}
+	Main()
 }
Author	SHA1	Message	Date
idk	491b3d37f3	update gs	2020-09-09 21:17:43 -04:00
idk	cc8e85c89c	Allow Firefox to break completely free of the Go app should the dev choose to do so	2020-09-06 17:41:59 -04:00
idk	d7055ec1f4	make it possible to just import it and use it in another app	2020-09-06 16:55:22 -04:00
idk	3d5c7fe9c1	bump	2020-08-24 00:54:46 -04:00
idk	a740c15292	bump	2020-08-24 00:46:57 -04:00
idk	d09c1e2514	bump	2020-08-23 23:26:14 -04:00
idk	607013b805	pre-load a libc for gingershrew	2020-08-23 00:54:33 -04:00
idk	56a5baade0	Make release version 116.0.73.097	2020-08-22 02:23:26 -04:00
idk	cb1740cf11	Make release version 116.0.73.096	2020-08-21 23:33:32 -04:00