From 81ea32f49c6819a36f2c8bb3b20ccf268518e7de Mon Sep 17 00:00:00 2001 From: idk Date: Thu, 24 Dec 2020 10:27:56 -0500 Subject: [PATCH] switch to i2pgit.org branch by default --- CHANGELOG.md | 2 +- Dockerfile | 6 +++--- Makefile | 14 +++++++------- README.md | 8 ++++---- cmd/reseed.go | 2 +- cmd/utils.go | 4 ++-- cmd/verify.go | 4 ++-- entrypoint.sh | 4 ++-- go.sum | 2 +- history.txt | 2 +- main.go | 2 +- reseed/homepage.go | 6 +++--- reseed/service.go | 2 +- 13 files changed, 29 insertions(+), 29 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 09df676..e4e4793 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -31,4 +31,4 @@ * numRi per su3 file: 75 --> 77 2016-01 - * fork from https://github.com/eyedeekay/i2p-tools-1 + * fork from https://github.com/idk/reseed-tools diff --git a/Dockerfile b/Dockerfile index d6c643e..df540fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ FROM debian:stable-backports ARG I2P_GID=1000 ARG I2P_UID=1000 -COPY . /var/lib/i2p/go/src/github.com/eyedeekay/i2p-tools-1 -WORKDIR /var/lib/i2p/go/src/github.com/eyedeekay/i2p-tools-1 +COPY . /var/lib/i2p/go/src/github.com/idk/reseed-tools +WORKDIR /var/lib/i2p/go/src/github.com/idk/reseed-tools RUN apt-get update && \ apt-get dist-upgrade -y && \ apt-get install -y git golang-1.13-go make && \ @@ -11,4 +11,4 @@ RUN apt-get update && \ RUN /usr/lib/go-1.13/bin/go build -v -tags netgo -ldflags '-w -extldflags "-static"' USER $I2P_UID WORKDIR /var/lib/i2p/i2p-config/reseed -ENTRYPOINT [ "/var/lib/i2p/go/src/github.com/eyedeekay/i2p-tools-1/entrypoint.sh" ] \ No newline at end of file +ENTRYPOINT [ "/var/lib/i2p/go/src/github.com/idk/reseed-tools/entrypoint.sh" ] \ No newline at end of file diff --git a/Makefile b/Makefile index d81f205..9e416ec 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION=0.0.4 +VERSION=0.0.5 APP=i2p-tools-1 USER_GH=eyedeekay @@ -8,8 +8,8 @@ GOARCH?="amd64" ARG=-v -tags netgo -ldflags '-w -extldflags "-static"' -MIN_GO_VERSION=`ls /usr/lib/go-1.14 2>/dev/null >/dev/null && echo 1.14` -MIN_GO_VERSION?=1.13 +#MIN_GO_VERSION=`ls /usr/lib/go-1.14 2>/dev/null >/dev/null && echo 1.14` +MIN_GO_VERSION?=1.15 I2P_UID=$(shell id -u i2psvc) I2P_GID=$(shell id -g i2psvc) @@ -62,12 +62,12 @@ build-unfork: /usr/lib/go-$(MIN_GO_VERSION)/bin/go build -o i2p-tools-md fork: - sed -i 's|eyedeekay/i2p-tools-1|eyedeekay/i2p-tools-1|g' main.go cmd/*.go reseed/*.go su3/*.go + sed -i 's|idk/reseed-tools|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go make gofmt build-fork unfork: - sed -i 's|eyedeekay/i2p-tools-1|eyedeekay/i2p-tools-1|g' main.go cmd/*.go reseed/*.go su3/*.go - sed -i 's|RTradeLtd/i2p-tools-1|eyedeekay/i2p-tools-1|g' main.go cmd/*.go reseed/*.go su3/*.go + sed -i 's|idk/reseed-tools|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go + sed -i 's|RTradeLtd/i2p-tools-1|idk/reseed-tools|g' main.go cmd/*.go reseed/*.go su3/*.go make gofmt build-unfork gofmt: @@ -134,4 +134,4 @@ docker-homerun: --volume $(HOME)/i2p/netDb:/var/lib/i2p/i2p-config/netDb:z \ --volume reseed-keys:/var/lib/i2p/i2p-config/reseed:z \ eyedeekay/reseed \ - --signer=hankhill19580@gmail.com \ No newline at end of file + --signer=hankhill19580@gmail.com diff --git a/README.md b/README.md index be5aa47..71a2eae 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ create, sign, and validate SU3 files. Please note that this requires at least Go If you have go installed you can download, build, and install this tool with `go get` ``` -go get github.com/eyedeekay/i2p-tools-1 +go get github.com/idk/reseed-tools i2p-tools -h ``` @@ -97,12 +97,12 @@ http://j7xszhsjy7orrnbdys7yykrssv5imkn4eid7n5ikcnxuhpaaw6cq.b32.i2p/ also a short guide and complete tech info. -## Experimental, currently only available from eyedeekay/i2p-tools-1 fork +## Experimental, currently only available from idk/reseed-tools fork -Requires ```go mod``` and at least go 1.13. To build the eyedeekay/i2p-tools-1 +Requires ```go mod``` and at least go 1.13. To build the idk/reseed-tools fork, from anywhere: - git clone https://github.com/eyedeekay/i2p-tools-1 + git clone https://github.com/idk/reseed-tools cd i2p-tools-1 make build diff --git a/cmd/reseed.go b/cmd/reseed.go index 25c9f18..0cb2b8a 100644 --- a/cmd/reseed.go +++ b/cmd/reseed.go @@ -16,9 +16,9 @@ import ( "github.com/cretz/bine/tor" "github.com/cretz/bine/torutil" "github.com/cretz/bine/torutil/ed25519" - "github.com/eyedeekay/i2p-tools-1/reseed" "github.com/eyedeekay/sam3" "github.com/eyedeekay/sam3/i2pkeys" + "github.com/idk/reseed-tools/reseed" "github.com/libp2p/go-libp2p" "github.com/libp2p/go-libp2p-core/host" "github.com/urfave/cli" diff --git a/cmd/utils.go b/cmd/utils.go index b17f2db..6c5df86 100644 --- a/cmd/utils.go +++ b/cmd/utils.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "github.com/eyedeekay/i2p-tools-1/reseed" - "github.com/eyedeekay/i2p-tools-1/su3" + "github.com/idk/reseed-tools/reseed" + "github.com/idk/reseed-tools/su3" ) func loadPrivateKey(path string) (*rsa.PrivateKey, error) { diff --git a/cmd/verify.go b/cmd/verify.go index 36e6fae..c25c80d 100644 --- a/cmd/verify.go +++ b/cmd/verify.go @@ -4,8 +4,8 @@ import ( "fmt" "io/ioutil" - "github.com/eyedeekay/i2p-tools-1/reseed" - "github.com/eyedeekay/i2p-tools-1/su3" + "github.com/idk/reseed-tools/reseed" + "github.com/idk/reseed-tools/su3" "github.com/urfave/cli" ) diff --git a/entrypoint.sh b/entrypoint.sh index d6ca1ac..1f5dfd9 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -1,5 +1,5 @@ #! /usr/bin/env sh -cp -r /var/lib/i2p/go/src/github.com/eyedeekay/i2p-tools-1/content ./content +cp -r /var/lib/i2p/go/src/github.com/idk/reseed-tools/content ./content -/var/lib/i2p/go/src/github.com/eyedeekay/i2p-tools-1/i2p-tools-1 reseed --yes=true --netdb=/var/lib/i2p/i2p-config/netDb $@ +/var/lib/i2p/go/src/github.com/idk/reseed-tools/i2p-tools-1 reseed --yes=true --netdb=/var/lib/i2p/i2p-config/netDb $@ diff --git a/go.sum b/go.sum index 36e8b50..9c3b606 100644 --- a/go.sum +++ b/go.sum @@ -66,7 +66,7 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/eyedeekay/i2p-tools-1 v0.0.4/go.mod h1:l36HvPTtSxbLHelUNo/GQ7+wYbi+oEL2xv/XJnj8aS0= +github.com/idk/reseed-tools v0.0.4/go.mod h1:l36HvPTtSxbLHelUNo/GQ7+wYbi+oEL2xv/XJnj8aS0= github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab h1:EfTRHxGSbiaEyxNzvKRBWVIDw3mD8xXGxj4gvwFzY7Q= github.com/eyedeekay/ramp v0.0.0-20190429201811-305b382042ab/go.mod h1:h7mvUAMgZ/rtRDUOkvKTK+8LnDMeUhJSoa5EPdB51fc= github.com/eyedeekay/sam3 v0.32.2 h1:xODDY5nBVg0oK7KaYk7ofkXFoHPsmI1umhSv1TZlS7s= diff --git a/history.txt b/history.txt index b0a9a82..3210d6b 100644 --- a/history.txt +++ b/history.txt @@ -41,4 +41,4 @@ * numRi per su3 file: 75 --> 77 2016-01 - * fork from https://github.com/eyedeekay/i2p-tools-1 + * fork from https://github.com/idk/reseed-tools diff --git a/main.go b/main.go index 872b9e2..74a291b 100644 --- a/main.go +++ b/main.go @@ -4,7 +4,7 @@ import ( "os" "runtime" - "github.com/eyedeekay/i2p-tools-1/cmd" + "github.com/idk/reseed-tools/cmd" "github.com/urfave/cli" ) diff --git a/reseed/homepage.go b/reseed/homepage.go index f9675ce..aab14a0 100644 --- a/reseed/homepage.go +++ b/reseed/homepage.go @@ -84,7 +84,7 @@ func HandleAFile(w http.ResponseWriter, dirPath, file string) { path := filepath.Join(BaseContentPath, file) f, err := ioutil.ReadFile(path) if err != nil { - w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/eyedeekay/i2p-tools-1\n\t" + err.Error())) + w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error())) return } CachedDataPages[file] = f @@ -99,7 +99,7 @@ func HandleALocalizedFile(w http.ResponseWriter, dirPath string) { dir := filepath.Join(BaseContentPath, "lang", dirPath) files, err := ioutil.ReadDir(dir) if err != nil { - w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/eyedeekay/i2p-tools-1\n\t" + err.Error())) + w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error())) } var f []byte for _, file := range files { @@ -110,7 +110,7 @@ func HandleALocalizedFile(w http.ResponseWriter, dirPath string) { path := filepath.Join(dir, file.Name()) b, err := ioutil.ReadFile(path) if err != nil { - w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/eyedeekay/i2p-tools-1\n\t" + err.Error())) + w.Write([]byte("Oops! Something went wrong handling your language. Please file a bug at https://github.com/idk/reseed-tools\n\t" + err.Error())) return } f = append(f, []byte(`
`)...) diff --git a/reseed/service.go b/reseed/service.go index 95db441..27f796f 100644 --- a/reseed/service.go +++ b/reseed/service.go @@ -15,7 +15,7 @@ import ( "sync" "time" - "github.com/eyedeekay/i2p-tools-1/su3" + "github.com/idk/reseed-tools/su3" ) type routerInfo struct {