get ready to take options

This commit is contained in:
idk
2019-11-14 18:12:27 -05:00
parent 72eb5c70de
commit f0ed37f391
5 changed files with 58 additions and 4 deletions

View File

@ -2,12 +2,16 @@
GO111MODULE=on
build:
cd reposam && go build -tags netgo \
-ldflags '-w -extldflags "-static"'
go build -tags netgo \
-ldflags '-w -extldflags "-static"' \
-o reposam/reposam
install:
install -m755 reposam/reposam /usr/local/bin
fmt:
gofmt -w *.go */*.go
fixup:
sed -i 's|CowYoSam|RepoSam|g' *.go
sed -i 's|cowyosam|reposam|g' *.go

6
go.mod
View File

@ -4,5 +4,11 @@ go 1.13
require (
github.com/eyedeekay/sam-forwarder v0.32.1-0.20190928041036-d2f767dbe008
github.com/geek1011/repogen v0.0.0-00010101000000-000000000000
github.com/tdewolff/minify v2.3.6+incompatible // indirect
github.com/tdewolff/parse v2.3.4+incompatible // indirect
github.com/ulikunitz/xz v0.5.6 // indirect
golang.org/x/crypto v0.0.0-20191112222119-e1110fd1c708
)
replace github.com/geek1011/repogen => github.com/eyedeekay/repogen v1.2.1-0.20191114224210-da24bd006789

27
go.sum
View File

@ -7,6 +7,7 @@ github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7Do
github.com/cryptix/go v1.3.1/go.mod h1:mFQotm9rTzptzvNjJM+1vSIDa/rVOVqMu0889GIXg70=
github.com/cryptix/goSam v0.1.0/go.mod h1:7ewkjhXT8V5RG07pvWUOHHtMahvGbeKlEv8ukUyRiTA=
github.com/d5/tengo v1.24.3/go.mod h1:VhLq8Q2QFhCIJO3NhvM934qOThykMqJi9y9Siqd1ocQ=
github.com/davecgh/go-spew v0.0.0-20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/eyedeekay/eephttpd v0.0.0-20190903000420-52f5a8485a4e/go.mod h1:wFPQsNBnY95LkuujFEZARo7slafRwoF0D97FFHBoZro=
github.com/eyedeekay/goSam v0.1.1-0.20190814204230-d4c9b8c57dd6/go.mod h1:kGTfZrncJ4CwMX3d1qA6bcMJTOcuTbOqgWg7WrFNAQ0=
github.com/eyedeekay/httptunnel v0.0.0-20190814204746-0081636585cd/go.mod h1:fD9CRejMpwLs7GC4mu5re58JInU/8Foi3b4hn0NT0a4=
@ -17,6 +18,12 @@ github.com/eyedeekay/outproxy v0.0.0-20190908174238-22bd71d43733/go.mod h1:jUBr6
github.com/eyedeekay/portcheck v0.0.0-20190218044454-bb8718669680/go.mod h1:8VVIH19/CU2VFJB8P6e58Mo9nvDqqKgllS0oQY3F83U=
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/repogen v1.2.0 h1:vMliCX3ysuT4RNyXuc2y0YHPtRm6PGvOxPYPqRTSCPY=
github.com/eyedeekay/repogen v1.2.0/go.mod h1:gb9vkm1LwTE7sKz81XryKxATAaPT/15kRws/ETl32t8=
github.com/eyedeekay/repogen v1.2.1-0.20191114221904-80e2fa1bfadd h1:eYwt5nRTbxhqU+95aDDNOXI4avHUVL/+D+CKocRsFUs=
github.com/eyedeekay/repogen v1.2.1-0.20191114221904-80e2fa1bfadd/go.mod h1:Go1A1vlQvadCUJpppzEC6aWcmyYMzcovNo8DcFVRX7o=
github.com/eyedeekay/repogen v1.2.1-0.20191114224210-da24bd006789 h1:k8aVG8uJ7Auz88pk0Hq8ofD4aFCyIH7asklV33R0uQw=
github.com/eyedeekay/repogen v1.2.1-0.20191114224210-da24bd006789/go.mod h1:Go1A1vlQvadCUJpppzEC6aWcmyYMzcovNo8DcFVRX7o=
github.com/eyedeekay/sam-forwarder v0.0.0-20190814201550-7c0d7cb0d56c/go.mod h1:Ptrm1d4a3KC5/cN264Gn6OntYOmcuJ8Pkyd7+hA01gw=
github.com/eyedeekay/sam-forwarder v0.0.0-20190831071254-d67c0c0e311f/go.mod h1:u4K8aGwSIuMSQ/OzsH7zkshnEvCQgUupfexLXZIjsDI=
github.com/eyedeekay/sam-forwarder v0.0.0-20190905212604-029317222e15/go.mod h1:kFP6jkqHUTGGW/nMUZLnRonkPWE9fyEc8/eSU1CqTFg=
@ -33,10 +40,29 @@ github.com/go-stack/stack v1.7.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/me
github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69 h1:7xsUJsB2NrdcttQPa7JLEaGzvdbk7KvfrjgHZXOQRo0=
github.com/gtank/cryptopasta v0.0.0-20170601214702-1f550f6f2f69/go.mod h1:YLEMZOtU+AZ7dhN9T/IpGhXVGly2bvkJQ+zxj3WeVQo=
github.com/justinas/nosurf v0.0.0-20190416172904-05988550ea18/go.mod h1:Aucr5I5chr4OCuuVB4LTuHVrKHBuyRSo7vM2hqrcb7E=
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d h1:RnWZeH8N8KXfbwMTex/KKMYMj0FJRCF6tQubUuQ02GM=
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d/go.mod h1:phT/jsRPBAEqjAibu1BurrabCBNTYiVI+zbmyCZJY6Q=
github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw=
github.com/mattn/go-zglob v0.0.1 h1:xsEx/XUoVlI6yXjqBK062zYhRTZltCNmYPx6v+8DNaY=
github.com/mattn/go-zglob v0.0.1/go.mod h1:9fxibJccNxU2cnpIKLRRFA7zX7qhkJIQWBb449FYHOo=
github.com/miolini/datacounter v0.0.0-20171104152933-fd4e42a1d5e0/go.mod h1:P6fDJzlxN+cWYR09KbE9/ta+Y6JofX9tAUhJpWkWPaM=
github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
github.com/tdewolff/minify v0.0.0-20180913035026-a8ba821b5bd8/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
github.com/tdewolff/minify v2.3.6+incompatible h1:2hw5/9ZvxhWLvBUnHE06gElGYz+Jv9R4Eys0XUzItYo=
github.com/tdewolff/minify v2.3.6+incompatible/go.mod h1:9Ov578KJUmAWpS6NeZwRZyT56Uf6o3Mcz9CEsg8USYs=
github.com/tdewolff/parse v0.0.0-20180825090006-bcb5c6a1c04e/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
github.com/tdewolff/parse v2.3.4+incompatible h1:x05/cnGwIMf4ceLuDMBOdQ1qGniMoxpP46ghf0Qzh38=
github.com/tdewolff/parse v2.3.4+incompatible/go.mod h1:8oBwCsVmUkgHO8M5iCzSIDtpzXOT0WXX9cWhz+bIzJQ=
github.com/tdewolff/test v1.0.0/go.mod h1:DiQUlutnqlEvdvhSn2LPGy4TFwRauAaYDsL+683RNX4=
github.com/ulikunitz/xz v0.0.0-20180703112113-636d36a76670/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
github.com/ulikunitz/xz v0.5.6 h1:jGHAfXawEGZQ3blwU5wnWKQJvAraT7Ftq9EXjnXYgt8=
github.com/ulikunitz/xz v0.5.6/go.mod h1:2bypXElzHzzJZwzH67Y6wb67pO62Rzfn7BSiF4ABRW8=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 h1:nIPpBwaJSVYIxUFsDv3M8ofmx9yWTog9BfvIu0q41lo=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
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=
@ -47,6 +73,7 @@ gitlab.com/golang-commonmark/linkify v0.0.0-20180917065525-c22b7bdb1179/go.mod h
gitlab.com/golang-commonmark/markdown v0.0.0-20181102083822-772775880e1f/go.mod h1:SIHlEr9462fpIfTrVWf3GqQDxnA65Vm3BMMsUtuA6W0=
gitlab.com/golang-commonmark/mdurl v0.0.0-20180912090424-e5bce34c34f2/go.mod h1:wQk4rLkWrdOPjUAtqJRJ10hIlseLSVYWP95PLrjDF9s=
gitlab.com/golang-commonmark/puny v0.0.0-20180912090636-2cd490539afe/go.mod h1:P9LSM1KVzrIstFgUaveuwiAm8PK5VTB3yJEU8kqlbrU=
golang.org/x/crypto v0.0.0-20180910181607-0e37d006457b/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20190829043050-9756ffdc2472/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=

View File

@ -8,8 +8,7 @@ import (
"github.com/eyedeekay/sam-forwarder/interface"
"github.com/eyedeekay/sam-forwarder/tcp"
//"github.com/jcelliott/lumber"
//"github.com/schollz/cowyo/server"
"github.com/geek1011/repogen"
)
func GenerateRandomBytes(n int) ([]byte, error) {
@ -30,6 +29,7 @@ func GenerateRandomBytes(n int) ([]byte, error) {
//a local service to i2p over the SAM API.
type RepoSam struct {
*samforwarder.SAMForwarder
*repogen.Repo
password string
ServeDir string
up bool

View File

@ -51,8 +51,25 @@ var (
certFile = flag.String("m", "cert", "Certificate name to use")
)
var (
maintainerOverride = flag.String("m", "", "overrides the maintainer of all packages")
origin = flag.String("o", "reposam", "sets the origin field used in the Release file")
description = flag.String("d", "generated by reposam", "sets the description field used in the Release file")
generateContents = flag.Bool("c", false, "generates the Contents index")
generateWeb = flag.Bool("b", false, "generate a web interface for browsing the packages")
watch = flag.Bool("w", false, "watch the input directory for new packages")
watchInterval = flag.Int("wi", 1, "the interval to check for new packages")
sversion = flag.Bool("v", false, "show the version")
privateKey = flag.String("key", "invalid.key", "private key for signing repository packages")
inRoot = flag.String("id", "not_a_dir", "directory to look for packages")
outRoot = flag.String("od", "not_a_dir", "directory to output the repository")
)
func main() {
flag.Parse()
if *inRoot != "not_a_dir" && *outRoot != "not_a_dir" && *privateKey != "invalid.key" {
log.Fatal("error, you must specify -key, -id, and -od")
}
var eepsite *reposam.RepoSam
var err error
config := i2ptunconf.NewI2PBlankTunConf()