Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dmsgcurl #238

Merged
merged 5 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .goreleaser-darwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,16 @@ builds:
main: ./cmd/dmsg-server/
ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget
binary: dmsgget
- id: dmsgcurl
binary: dmsgcurl
goos:
- darwin
goarch:
- arm64
- amd64
env:
- CGO_ENABLED=0
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgpty-ui
Expand Down Expand Up @@ -98,7 +98,7 @@ archives:
- dmsg-server
- dmsgpty-ui
- dmsgpty-host
- dmsgget
- dmsgcurl
- dmsgpty-cli
allow_different_binary_count: true

Expand Down
32 changes: 16 additions & 16 deletions .goreleaser-linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121,32 +121,32 @@ builds:
main: ./cmd/dmsg-server/
ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget-amd64
binary: dmsgget
- id: dmsgcurl-amd64
binary: dmsgcurl
goos:
- linux
goarch:
- amd64
env:
- CGO_ENABLED=1
- CC=/home/runner/work/dmsg/dmsg/musl-data/x86_64-linux-musl-cross/bin/x86_64-linux-musl-gcc
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget-arm64
binary: dmsgget
- id: dmsgcurl-arm64
binary: dmsgcurl
goos:
- linux
goarch:
- arm64
env:
- CGO_ENABLED=1
- CC=/home/runner/work/dmsg/dmsg/musl-data/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget-arm
binary: dmsgget
- id: dmsgcurl-arm
binary: dmsgcurl
goos:
- linux
goarch:
Expand All @@ -156,11 +156,11 @@ builds:
env:
- CGO_ENABLED=1
- CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabi-cross/bin/arm-linux-musleabi-gcc
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget-armhf
binary: dmsgget
- id: dmsgcurl-armhf
binary: dmsgcurl
goos:
- linux
goarch:
Expand All @@ -170,7 +170,7 @@ builds:
env:
- CGO_ENABLED=1
- CC=/home/runner/work/dmsg/dmsg/musl-data/arm-linux-musleabihf-cross/bin/arm-linux-musleabihf-gcc
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -linkmode external -extldflags '-static' -buildid= -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgpty-ui-amd64
Expand Down Expand Up @@ -339,7 +339,7 @@ archives:
- dmsg-server-amd64
- dmsgpty-ui-amd64
- dmsgpty-cli-amd64
- dmsgget-amd64
- dmsgcurl-amd64
- dmsgpty-host-amd64

- id: arm64
Expand All @@ -351,7 +351,7 @@ archives:
- dmsg-server-arm64
- dmsgpty-ui-arm64
- dmsgpty-cli-arm64
- dmsgget-arm64
- dmsgcurl-arm64
- dmsgpty-host-arm64

- id: arm
Expand All @@ -363,7 +363,7 @@ archives:
- dmsg-server-arm
- dmsgpty-ui-arm
- dmsgpty-cli-arm
- dmsgget-arm
- dmsgcurl-arm
- dmsgpty-host-arm

- id: armhf
Expand All @@ -375,7 +375,7 @@ archives:
- dmsg-server-armhf
- dmsgpty-ui-armhf
- dmsgpty-cli-armhf
- dmsgget-armhf
- dmsgcurl-armhf
- dmsgpty-host-armhf

checksum:
Expand Down
8 changes: 4 additions & 4 deletions .goreleaser-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,16 @@ builds:
main: ./cmd/dmsg-server/
ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgget
binary: dmsgget
- id: dmsgcurl
binary: dmsgcurl
goos:
- windows
goarch:
- amd64
- 386
env:
- CGO_ENABLED=0
main: ./cmd/dmsgget/
main: ./cmd/dmsgcurl/
ldflags: -s -w -X github.com/skycoin/skywire-utilities/pkg/buildinfo.version=v{{.Version}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.commit={{.ShortCommit}} -X github.com/skycoin/skywire-utilities/pkg/buildinfo.date={{.Date}}

- id: dmsgpty-ui
Expand Down Expand Up @@ -95,7 +95,7 @@ archives:
builds:
- dmsg-discovery
- dmsg-server
- dmsgget
- dmsgcurl
- dmsgpty-cli
- dmsgpty-ui
- dmsgpty-host
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ dep: ## Sorts dependencies
${OPTS} go mod vendor -v
${OPTS} go mod tidy -v

install: ## Install `dmsg-discovery`, `dmsg-server`, `dmsgget`,`dmsgpty-cli`, `dmsgpty-host`, `dmsgpty-ui`
install: ## Install `dmsg-discovery`, `dmsg-server`, `dmsgcurl`,`dmsgpty-cli`, `dmsgpty-host`, `dmsgpty-ui`
${OPTS} go install ${BUILD_OPTS} ./cmd/*

build: ## Build binaries into ./bin
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ The connection between a `dmsg.Client` and `dmsg.Server` is called a `dmsg.Sessi

## Dmsg tools and libraries

- [`dmsgget`](./docs/dmsgget.md) - Simplified `wget` over `dmsg`.
- [`dmsgcurl`](./docs/dmsgcurl.md) - Simplified `curl` over `dmsg`.
- [`dmsgpty`](./docs/dmsgpty.md) - Simplified `SSH` over `dmsg`.
## Additional resources
- [`dmsg` examples.](./examples)
Expand Down
6 changes: 2 additions & 4 deletions cmd/dmsg/dmsg.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ import (

dmsgdisc "github.com/skycoin/dmsg/cmd/dmsg-discovery/commands"
dmsgserver "github.com/skycoin/dmsg/cmd/dmsg-server/commands"
dmsgget "github.com/skycoin/dmsg/cmd/dmsgget/commands"
dmsgcurl "github.com/skycoin/dmsg/cmd/dmsgcurl/commands"
dmsghttp "github.com/skycoin/dmsg/cmd/dmsghttp/commands"
dmsgpost "github.com/skycoin/dmsg/cmd/dmsgpost/commands"
dmsgptycli "github.com/skycoin/dmsg/cmd/dmsgpty-cli/commands"
dmsgptyhost "github.com/skycoin/dmsg/cmd/dmsgpty-host/commands"
dmsgptyui "github.com/skycoin/dmsg/cmd/dmsgpty-ui/commands"
Expand All @@ -27,9 +26,8 @@ func init() {
dmsgptyCmd,
dmsgdisc.RootCmd,
dmsgserver.RootCmd,
dmsgget.RootCmd,
dmsghttp.RootCmd,
dmsgpost.RootCmd,
dmsgcurl.RootCmd,
)
var helpflag bool
RootCmd.SetUsageTemplate(help)
Expand Down
Loading