Skip to content

Commit a657e1f

Browse files
UmanShahzadUmanShahzad
authored
Merge pull request #59 from ipinfo/uman/fixes
Batch of changes for next release
2 parents f42b3e3 + 219f943 commit a657e1f

File tree

247 files changed

+22785
-20519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+22785
-20519
lines changed

‎README.md‎

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ brew install ipinfo-cli
2424
OR to install the latest `amd64` version without automatic updates:
2525

2626
```bash
27-
curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.1.1/macos.sh | sh
27+
curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.2.0/macos.sh | sh
2828
```
2929

3030
### Debian / Ubuntu (amd64)
3131

3232
```bash
33-
curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.1.1/deb.sh | sh
33+
curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-2.2.0/deb.sh | sh
3434
```
3535

3636
### FreeBSD
@@ -42,8 +42,8 @@ cd /usr/ports/net/ipinfo-cli && make install clean
4242
OR
4343

4444
```bash
45-
curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.1.1/ipinfo_2.1.1.deb
46-
sudo dpkg -i ipinfo_2.1.1.deb
45+
curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.2.0/ipinfo_2.2.0.deb
46+
sudo dpkg -i ipinfo_2.2.0.deb
4747
```
4848

4949
### Using `go get`
@@ -97,12 +97,12 @@ After choosing a platform `PLAT` from above, run:
9797

9898
```bash
9999
# for Windows, use ".zip" instead of ".tar.gz"
100-
curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.1.1/ipinfo_2.1.1_${PLAT}.tar.gz
100+
curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-2.2.0/ipinfo_2.2.0_${PLAT}.tar.gz
101101
# OR
102-
wget https://github.com/ipinfo/cli/releases/download/ipinfo-2.1.1/ipinfo_2.1.1_${PLAT}.tar.gz
102+
wget https://github.com/ipinfo/cli/releases/download/ipinfo-2.2.0/ipinfo_2.2.0_${PLAT}.tar.gz
103103

104-
tar -xvf ipinfo_2.1.1_${PLAT}.tar.gz
105-
mv ipinfo_2.1.1_${PLAT} /usr/local/bin/ipinfo
104+
tar -xvf ipinfo_2.2.0_${PLAT}.tar.gz
105+
mv ipinfo_2.2.0_${PLAT} /usr/local/bin/ipinfo
106106
```
107107

108108
### Using `git`
@@ -148,9 +148,9 @@ Currently these subcommands are separately shipped:
148148

149149
| CLI | Version |
150150
| ---------- | ------- |
151-
| grepip | [1.1.0](https://github.com/ipinfo/cli/releases/tag/grepip-1.1.0) |
152-
| cidr2range | [1.1.1](https://github.com/ipinfo/cli/releases/tag/cidr2range-1.1.1) |
153-
| range2cidr | [1.1.0](https://github.com/ipinfo/cli/releases/tag/range2cidr-1.1.0) |
151+
| grepip | [1.2.0](https://github.com/ipinfo/cli/releases/tag/grepip-1.2.0) |
152+
| cidr2range | [1.2.0](https://github.com/ipinfo/cli/releases/tag/cidr2range-1.2.0) |
153+
| range2cidr | [1.2.0](https://github.com/ipinfo/cli/releases/tag/range2cidr-1.2.0) |
154154

155155
## Quick Start
156156

@@ -279,12 +279,29 @@ If you have an account, see our
279279

280280
All examples in this document use a token with all data enabled.
281281

282-
## Disabling Color Output
282+
## Color Output
283+
284+
### Disabling Color Output
283285

284286
All our CLIs respect either the `--nocolor` flag or the
285287
[`NO_COLOR`](https://no-color.org/) environment variable to disable color
286288
output.
287289

290+
### Color on Windows
291+
292+
To enable color support for the Windows command prompt, run the following to
293+
enable [`Console Virtual Terminal Sequences`](https://docs.microsoft.com/en-us/windows/console/console-virtual-terminal-sequences).
294+
295+
```cmd
296+
REG ADD HKCU\CONSOLE /f /v VirtualTerminalLevel /t REG_DWORD /d 1
297+
```
298+
299+
You can disable this by running the following:
300+
301+
```cmd
302+
REG DELETE HKCU\CONSOLE /f /v VirtualTerminalLevel
303+
```
304+
288305
## Other IPinfo Tools
289306

290307
There are official IPinfo client libraries available for many languages including PHP, Python, Go, Java, Ruby, and many popular frameworks such as Django, Rails and Laravel. There are also many third party libraries and integrations available for our API.

‎cidr2range/deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VSN=1.1.1
3+
VSN=1.2.0
44

55
curl -LO https://github.com/ipinfo/cli/releases/download/cidr2range-${VSN}/cidr2range_${VSN}.deb
66
sudo dpkg -i cidr2range_${VSN}.deb

‎cidr2range/dist/DEBIAN/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Source: cidr2range
22
Section: utils
3-
Version: 1.1.1
3+
Version: 1.2.0
44
Priority: optional
55
Maintainer: IPinfo <support@ipinfo.io>
66
Vcs-Git: https://github.com/ipinfo/cli

‎cidr2range/macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VSN=1.1.1
3+
VSN=1.2.0
44
PLAT=darwin_amd64
55

66
curl -LO https://github.com/ipinfo/cli/releases/download/cidr2range-${VSN}/cidr2range_${VSN}_${PLAT}.tar.gz

‎cidr2range/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
)
1313

1414
var progBase = filepath.Base(os.Args[0])
15-
var version = "1.1.1"
15+
var version = "1.2.0"
1616

1717
func printHelp() {
1818
fmt.Printf(

‎go.mod‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,14 @@ require (
77
github.com/fatih/color v1.10.0
88
github.com/hashicorp/errwrap v1.1.0 // indirect
99
github.com/hashicorp/go-multierror v1.1.1
10-
github.com/ipinfo/go/v2 v2.5.3
10+
github.com/ipinfo/go/v2 v2.5.4
1111
github.com/jszwec/csvutil v1.4.0
1212
github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
1313
github.com/posener/script v1.1.5
1414
github.com/spf13/pflag v1.0.5
1515
github.com/stretchr/testify v1.7.0
16-
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988 // indirect
16+
go.etcd.io/bbolt v1.3.6
17+
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef // indirect
1718
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf
1819
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
1920
)

‎go.sum‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brv
99
github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
1010
github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
1111
github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
12-
github.com/ipinfo/go/v2 v2.5.3 h1:N8Ll2LDgzA7NTmHSaaQcFzmVw0RLyuSNDwX5cZRyA/o=
13-
github.com/ipinfo/go/v2 v2.5.3/go.mod h1:2MrJVdUamrTc5VdC7yrbKGbsOOxMtdUpnpBJmtZgA8o=
12+
github.com/ipinfo/go/v2 v2.5.4 h1:bfoNG2FJ+/SNwdTd/LlN8AJ0BrJf/W7Ko4FNGwv9Ohk=
13+
github.com/ipinfo/go/v2 v2.5.4/go.mod h1:2MrJVdUamrTc5VdC7yrbKGbsOOxMtdUpnpBJmtZgA8o=
1414
github.com/jszwec/csvutil v1.4.0 h1:ro7gZN8PRsyNUEX8qE/eYPE5/kffEXMs+4eRcOd1oUk=
1515
github.com/jszwec/csvutil v1.4.0/go.mod h1:Rpu7Uu9giO9subDyMCIQfHVDuLrcaC36UA4YcJjGBkg=
1616
github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
@@ -32,13 +32,16 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
3232
github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
3333
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
3434
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
35+
go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU=
36+
go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4=
3537
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a h1:DcqTD9SDLc+1P/r1EmRBwnVsrOwW+kk2vWf9n+1sGhs=
3638
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3739
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3840
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
41+
golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
3942
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
40-
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988 h1:EjgCl+fVlIaPJSori0ikSz3uV0DOHKWOJFpv1sAAhBM=
41-
golang.org/x/sys v0.0.0-20210420205809-ac73e9fd8988/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
43+
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef h1:fPxZ3Umkct3LZ8gK9nbk+DWDJ9fstZa2grBn+lWVKPs=
44+
golang.org/x/sys v0.0.0-20211004093028-2c5d950f24ef/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
4245
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M=
4346
golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
4447
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

‎grepip/deb.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VSN=1.1.0
3+
VSN=1.2.0
44

55
curl -LO https://github.com/ipinfo/cli/releases/download/grepip-${VSN}/grepip_${VSN}.deb
66
sudo dpkg -i grepip_${VSN}.deb

‎grepip/dist/DEBIAN/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Source: grepip
22
Section: utils
3-
Version: 1.1.0
3+
Version: 1.2.0
44
Priority: optional
55
Maintainer: IPinfo <support@ipinfo.io>
66
Vcs-Git: https://github.com/ipinfo/cli

‎grepip/macos.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
VSN=1.1.0
3+
VSN=1.2.0
44
PLAT=darwin_amd64
55

66
curl -LO https://github.com/ipinfo/cli/releases/download/grepip-${VSN}/grepip_${VSN}_${PLAT}.tar.gz

0 commit comments

Comments
 (0)