diff --git a/go.mod b/go.mod index 24097d7b..6f7e79f4 100644 --- a/go.mod +++ b/go.mod @@ -7,9 +7,7 @@ require ( github.com/jinzhu/copier v0.2.8 github.com/magiconair/properties v1.8.5 github.com/spf13/cobra v1.1.3 - github.com/timtadh/data-structures v0.5.3 // indirect github.com/timtadh/lexmachine v0.2.2 - golang.org/x/sys v0.0.0-20210510120138-977fb7262007 // indirect gopkg.in/op/go-logging.v1 v1.0.0-20160211212156-b2cb9fa56473 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) @@ -19,6 +17,8 @@ require ( github.com/mattn/go-colorable v0.1.8 // indirect github.com/mattn/go-isatty v0.0.12 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/timtadh/data-structures v0.5.3 // indirect + golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect ) diff --git a/go.sum b/go.sum index af6a6bfd..fd50a3cd 100644 --- a/go.sum +++ b/go.sum @@ -258,8 +258,8 @@ golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007 h1:gG67DSER+11cZvqIMb8S8bt0vZtiN6xWYARwirrOSfE= -golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e h1:WUoyKPm6nCo1BnNUvPGnFG3T5DUVem42yDJZZ4CNxMA= +golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= diff --git a/scripts/genman.sh b/scripts/generate-man-page.sh similarity index 93% rename from scripts/genman.sh rename to scripts/generate-man-page.sh index 5f2099ba..35be34f8 100755 --- a/scripts/genman.sh +++ b/scripts/generate-man-page.sh @@ -25,4 +25,4 @@ pandoc \ --variable=section:"1" \ --variable=author:"Mike Farah" \ --variable=header:"${header}" \ - --standalone --to man man.md -o yq.1 \ No newline at end of file + --standalone --to man man.md -o build/yq.1 \ No newline at end of file diff --git a/scripts/install-man-page.sh b/scripts/install-man-page.sh new file mode 100755 index 00000000..499d0efa --- /dev/null +++ b/scripts/install-man-page.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +cp yq.1 /usr/local/share/man/man1/. \ No newline at end of file diff --git a/scripts/xcompile.sh b/scripts/xcompile.sh index 15996e4b..5d967493 100755 --- a/scripts/xcompile.sh +++ b/scripts/xcompile.sh @@ -6,9 +6,12 @@ set -e CGO_ENABLED=0 gox -ldflags "${LDFLAGS}" -output="build/yq_{{.OS}}_{{.Arch}}" --osarch="darwin/amd64 darwin/arm64 freebsd/386 freebsd/amd64 freebsd/arm linux/386 linux/amd64 linux/arm linux/arm64 linux/mips linux/mips64 linux/mips64le linux/mipsle linux/ppc64 linux/ppc64le linux/s390x netbsd/386 netbsd/amd64 netbsd/arm openbsd/386 openbsd/amd64 windows/386 windows/amd64" +./scripts/generate-man-page.sh + cd build -find . -executable -type f | xargs -I {} tar czvf {}.tar.gz {} +find . -executable -type f | xargs -I {} tar czvf {}.tar.gz {} yq.1 -C ../scripts install-man-page.sh +tar czvf yq_man_page_only.tar.gz yq.1 -C ../scripts install-man-page.sh rhash -r -a . -o checksums @@ -17,6 +20,7 @@ rhash --list-hashes > checksums_hashes_order # just in case find thinks this is executable... rm -f checksums_hashes_order.tar.gz rm -f checksums.tar.gz +rm yq.1 rm yq_windows_386.exe.tar.gz rm yq_windows_amd64.exe.tar.gz