Browse Source

fix up imports

bryanl 2 years ago
parent
commit
8a813e84fd
53 changed files with 77 additions and 80 deletions
  1. 1
    2
      cmd/doctl-gen-doc/main.go
  2. 1
    2
      cmd/install-doctl/main.go
  3. 2
    3
      cmd/release-doctl/main.go
  4. 1
    1
      commands/account_test.go
  5. 2
    2
      commands/actions.go
  6. 2
    2
      commands/actions_test.go
  7. 1
    1
      commands/auth.go
  8. 1
    1
      commands/commands.go
  9. 4
    4
      commands/commands_test.go
  10. 2
    2
      commands/doit.go
  11. 2
    2
      commands/domains.go
  12. 2
    2
      commands/domains_test.go
  13. 2
    2
      commands/droplet_actions.go
  14. 1
    1
      commands/droplet_actions_test.go
  15. 2
    2
      commands/droplets.go
  16. 2
    2
      commands/droplets_test.go
  17. 2
    2
      commands/floating_ip_actions.go
  18. 2
    2
      commands/floating_ips.go
  19. 1
    1
      commands/floating_ips_test.go
  20. 1
    1
      commands/header.go
  21. 2
    2
      commands/image_actions.go
  22. 1
    1
      commands/image_actions_test.go
  23. 2
    2
      commands/images.go
  24. 1
    1
      commands/images_test.go
  25. 1
    1
      commands/output.go
  26. 1
    1
      commands/plugin.go
  27. 1
    1
      commands/regions_test.go
  28. 1
    1
      commands/sizes_test.go
  29. 2
    2
      commands/ssh.go
  30. 2
    2
      commands/ssh_test.go
  31. 2
    2
      commands/sshkeys.go
  32. 2
    2
      commands/sshkeys_test.go
  33. 1
    1
      commands/version.go
  34. 1
    1
      do/mocks/AccountService.go
  35. 1
    1
      do/mocks/ActionsService.go
  36. 1
    1
      do/mocks/DomainsService.go
  37. 1
    1
      do/mocks/DropletActionsService.go
  38. 1
    1
      do/mocks/DropletsService.go
  39. 1
    1
      do/mocks/FloatingIPActionsService.go
  40. 1
    1
      do/mocks/FloatingIPsService.go
  41. 1
    1
      do/mocks/ImageActionsService.go
  42. 1
    1
      do/mocks/ImagesService.go
  43. 1
    1
      do/mocks/KeysService.go
  44. 1
    1
      do/mocks/RegionsService.go
  45. 1
    1
      do/mocks/SizesService.go
  46. 2
    2
      doit.go
  47. 2
    2
      pkg/ssh/ssh.go
  48. 1
    1
      pkg/system/meminfo_linux.go
  49. 1
    1
      pkg/system/meminfo_unix_test.go
  50. 2
    2
      pkg/term/term_windows.go
  51. 1
    1
      scripts/build.sh
  52. 2
    2
      scripts/stage.sh
  53. 1
    1
      util.go

+ 1
- 2
cmd/doctl-gen-doc/main.go View File

@@ -1,4 +1,3 @@
1
-
2 1
 /*
3 2
 Copyright 2016 The Doctl Authors All rights reserved.
4 3
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,7 +25,7 @@ import (
26 25
 	"strings"
27 26
 	"time"
28 27
 
29
-	"github.com/bryanl/doit/commands"
28
+	"github.com/digitalocean/doctl/commands"
30 29
 	"github.com/spf13/cobra"
31 30
 	"github.com/spf13/cobra/doc"
32 31
 )

+ 1
- 2
cmd/install-doctl/main.go View File

@@ -1,4 +1,3 @@
1
-
2 1
 /*
3 2
 Copyright 2016 The Doctl Authors All rights reserved.
4 3
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +24,7 @@ import (
25 24
 	"runtime"
26 25
 	"strings"
27 26
 
28
-	"github.com/bryanl/doit/install"
27
+	"github.com/digitalocean/doctl/install"
29 28
 	"github.com/fatih/color"
30 29
 )
31 30
 

+ 2
- 3
cmd/release-doctl/main.go View File

@@ -1,4 +1,3 @@
1
-
2 1
 /*
3 2
 Copyright 2016 The Doctl Authors All rights reserved.
4 3
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +17,8 @@ import (
18 17
 	"flag"
19 18
 	"log"
20 19
 
21
-	"github.com/bryanl/doit"
22
-	"github.com/bryanl/doit/install"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/install"
23 22
 )
24 23
 
25 24
 var (

+ 1
- 1
commands/account_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl/do"
20 20
 	"github.com/digitalocean/godo"
21 21
 	"github.com/stretchr/testify/assert"
22 22
 )

+ 2
- 2
commands/actions.go View File

@@ -18,8 +18,8 @@ import (
18 18
 	"strconv"
19 19
 	"time"
20 20
 
21
-	"github.com/bryanl/doit"
22
-	"github.com/bryanl/doit/do"
21
+	"github.com/digitalocean/doctl"
22
+	"github.com/digitalocean/doctl/do"
23 23
 	"github.com/spf13/cobra"
24 24
 )
25 25
 

+ 2
- 2
commands/actions_test.go View File

@@ -17,8 +17,8 @@ import (
17 17
 	"testing"
18 18
 	"time"
19 19
 
20
-	"github.com/bryanl/doit"
21
-	"github.com/bryanl/doit/do"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/do"
22 22
 	"github.com/digitalocean/godo"
23 23
 	"github.com/stretchr/testify/assert"
24 24
 )

+ 1
- 1
commands/auth.go View File

@@ -26,7 +26,7 @@ import (
26 26
 
27 27
 	"golang.org/x/crypto/ssh/terminal"
28 28
 
29
-	"github.com/bryanl/doit"
29
+	"github.com/digitalocean/doctl"
30 30
 	"github.com/bryanl/doit-server"
31 31
 	"github.com/bryanl/webbrowser"
32 32
 	"github.com/gorilla/websocket"

+ 1
- 1
commands/commands.go View File

@@ -20,7 +20,7 @@ import (
20 20
 	"io"
21 21
 	"strings"
22 22
 
23
-	"github.com/bryanl/doit"
23
+	"github.com/digitalocean/doctl"
24 24
 )
25 25
 
26 26
 // Displayable is a displable entity. These are used for printing results.

+ 4
- 4
commands/commands_test.go View File

@@ -19,10 +19,10 @@ import (
19 19
 	"sort"
20 20
 	"testing"
21 21
 
22
-	"github.com/bryanl/doit"
23
-	"github.com/bryanl/doit/do"
24
-	domocks "github.com/bryanl/doit/do/mocks"
25
-	"github.com/bryanl/doit/pkg/runner"
22
+	"github.com/digitalocean/doctl"
23
+	"github.com/digitalocean/doctl/do"
24
+	domocks "github.com/digitalocean/doctl/do/mocks"
25
+	"github.com/digitalocean/doctl/pkg/runner"
26 26
 	"github.com/digitalocean/godo"
27 27
 	"github.com/spf13/viper"
28 28
 	"github.com/stretchr/testify/assert"

+ 2
- 2
commands/doit.go View File

@@ -19,8 +19,8 @@ import (
19 19
 	"os"
20 20
 	"strings"
21 21
 
22
-	"github.com/bryanl/doit"
23
-	"github.com/bryanl/doit/do"
22
+	"github.com/digitalocean/doctl"
23
+	"github.com/digitalocean/doctl/do"
24 24
 	"github.com/fatih/color"
25 25
 	"github.com/spf13/cobra"
26 26
 	"github.com/spf13/viper"

+ 2
- 2
commands/domains.go View File

@@ -18,8 +18,8 @@ import (
18 18
 	"fmt"
19 19
 	"strconv"
20 20
 
21
-	"github.com/bryanl/doit"
22
-	"github.com/bryanl/doit/do"
21
+	"github.com/digitalocean/doctl"
22
+	"github.com/digitalocean/doctl/do"
23 23
 	"github.com/digitalocean/godo"
24 24
 	"github.com/spf13/cobra"
25 25
 )

+ 2
- 2
commands/domains_test.go View File

@@ -16,8 +16,8 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit"
20
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl"
20
+	"github.com/digitalocean/doctl/do"
21 21
 	"github.com/digitalocean/godo"
22 22
 	"github.com/stretchr/testify/assert"
23 23
 )

+ 2
- 2
commands/droplet_actions.go View File

@@ -16,8 +16,8 @@ package commands
16 16
 import (
17 17
 	"strconv"
18 18
 
19
-	"github.com/bryanl/doit"
20
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl"
20
+	"github.com/digitalocean/doctl/do"
21 21
 	"github.com/spf13/cobra"
22 22
 )
23 23
 

+ 1
- 1
commands/droplet_actions_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit"
19
+	"github.com/digitalocean/doctl"
20 20
 	"github.com/stretchr/testify/assert"
21 21
 )
22 22
 

+ 2
- 2
commands/droplets.go View File

@@ -21,8 +21,8 @@ import (
21 21
 	"strings"
22 22
 	"sync"
23 23
 
24
-	"github.com/bryanl/doit"
25
-	"github.com/bryanl/doit/do"
24
+	"github.com/digitalocean/doctl"
25
+	"github.com/digitalocean/doctl/do"
26 26
 	"github.com/digitalocean/godo"
27 27
 	"github.com/gobwas/glob"
28 28
 	"github.com/spf13/cobra"

+ 2
- 2
commands/droplets_test.go View File

@@ -18,8 +18,8 @@ import (
18 18
 	"strconv"
19 19
 	"testing"
20 20
 
21
-	"github.com/bryanl/doit"
22
-	"github.com/bryanl/doit/do"
21
+	"github.com/digitalocean/doctl"
22
+	"github.com/digitalocean/doctl/do"
23 23
 	"github.com/digitalocean/godo"
24 24
 	"github.com/stretchr/testify/assert"
25 25
 )

+ 2
- 2
commands/floating_ip_actions.go View File

@@ -17,8 +17,8 @@ import (
17 17
 	"fmt"
18 18
 	"strconv"
19 19
 
20
-	"github.com/bryanl/doit"
21
-	"github.com/bryanl/doit/do"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/do"
22 22
 	"github.com/spf13/cobra"
23 23
 )
24 24
 

+ 2
- 2
commands/floating_ips.go View File

@@ -17,8 +17,8 @@ import (
17 17
 	"errors"
18 18
 	"fmt"
19 19
 
20
-	"github.com/bryanl/doit"
21
-	"github.com/bryanl/doit/do"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/do"
22 22
 	"github.com/digitalocean/godo"
23 23
 	"github.com/spf13/cobra"
24 24
 )

+ 1
- 1
commands/floating_ips_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit"
19
+	"github.com/digitalocean/doctl"
20 20
 	"github.com/digitalocean/godo"
21 21
 	"github.com/stretchr/testify/assert"
22 22
 )

+ 1
- 1
commands/header.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"strings"
18 18
 
19
-	"github.com/bryanl/doit"
19
+	"github.com/digitalocean/doctl"
20 20
 )
21 21
 
22 22
 func handleColumns(ns string, config doit.Config) ([]string, error) {

+ 2
- 2
commands/image_actions.go View File

@@ -17,8 +17,8 @@ import (
17 17
 	"fmt"
18 18
 	"strconv"
19 19
 
20
-	"github.com/bryanl/doit"
21
-	"github.com/bryanl/doit/do"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/do"
22 22
 	"github.com/digitalocean/godo"
23 23
 	"github.com/spf13/cobra"
24 24
 )

+ 1
- 1
commands/image_actions_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit"
19
+	"github.com/digitalocean/doctl"
20 20
 	"github.com/digitalocean/godo"
21 21
 	"github.com/stretchr/testify/assert"
22 22
 )

+ 2
- 2
commands/images.go View File

@@ -17,8 +17,8 @@ import (
17 17
 	"fmt"
18 18
 	"strconv"
19 19
 
20
-	"github.com/bryanl/doit"
21
-	"github.com/bryanl/doit/do"
20
+	"github.com/digitalocean/doctl"
21
+	"github.com/digitalocean/doctl/do"
22 22
 	"github.com/digitalocean/godo"
23 23
 	"github.com/spf13/cobra"
24 24
 )

+ 1
- 1
commands/images_test.go View File

@@ -17,7 +17,7 @@ import (
17 17
 	"strconv"
18 18
 	"testing"
19 19
 
20
-	"github.com/bryanl/doit"
20
+	"github.com/digitalocean/doctl"
21 21
 	"github.com/digitalocean/godo"
22 22
 	"github.com/stretchr/testify/assert"
23 23
 )

+ 1
- 1
commands/output.go View File

@@ -18,7 +18,7 @@ import (
18 18
 	"io"
19 19
 	"text/tabwriter"
20 20
 
21
-	"github.com/bryanl/doit/do"
21
+	"github.com/digitalocean/doctl/do"
22 22
 )
23 23
 
24 24
 var (

+ 1
- 1
commands/plugin.go View File

@@ -19,7 +19,7 @@ import (
19 19
 	"path/filepath"
20 20
 	"strings"
21 21
 
22
-	"github.com/bryanl/doit/pluginhost"
22
+	"github.com/digitalocean/doctl/pluginhost"
23 23
 	"github.com/spf13/cobra"
24 24
 )
25 25
 

+ 1
- 1
commands/regions_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl/do"
20 20
 	"github.com/digitalocean/godo"
21 21
 	"github.com/stretchr/testify/assert"
22 22
 )

+ 1
- 1
commands/sizes_test.go View File

@@ -16,7 +16,7 @@ package commands
16 16
 import (
17 17
 	"testing"
18 18
 
19
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl/do"
20 20
 	"github.com/digitalocean/godo"
21 21
 	"github.com/stretchr/testify/assert"
22 22
 )

+ 2
- 2
commands/ssh.go View File

@@ -22,8 +22,8 @@ import (
22 22
 	"strconv"
23 23
 	"strings"
24 24
 
25
-	"github.com/bryanl/doit"
26
-	"github.com/bryanl/doit/do"
25
+	"github.com/digitalocean/doctl"
26
+	"github.com/digitalocean/doctl/do"
27 27
 )
28 28
 
29 29
 const (

+ 2
- 2
commands/ssh_test.go View File

@@ -18,8 +18,8 @@ import (
18 18
 	"strconv"
19 19
 	"testing"
20 20
 
21
-	"github.com/bryanl/doit"
22
-	"github.com/bryanl/doit/pkg/runner"
21
+	"github.com/digitalocean/doctl"
22
+	"github.com/digitalocean/doctl/pkg/runner"
23 23
 	"github.com/stretchr/testify/assert"
24 24
 )
25 25
 

+ 2
- 2
commands/sshkeys.go View File

@@ -16,8 +16,8 @@ package commands
16 16
 import (
17 17
 	"io/ioutil"
18 18
 
19
-	"github.com/bryanl/doit"
20
-	"github.com/bryanl/doit/do"
19
+	"github.com/digitalocean/doctl"
20
+	"github.com/digitalocean/doctl/do"
21 21
 	"github.com/digitalocean/godo"
22 22
 	"github.com/spf13/cobra"
23 23
 	"golang.org/x/crypto/ssh"

+ 2
- 2
commands/sshkeys_test.go View File

@@ -19,8 +19,8 @@ import (
19 19
 	"path/filepath"
20 20
 	"testing"
21 21
 
22
-	"github.com/bryanl/doit"
23
-	"github.com/bryanl/doit/do"
22
+	"github.com/digitalocean/doctl"
23
+	"github.com/digitalocean/doctl/do"
24 24
 	"github.com/digitalocean/godo"
25 25
 	"github.com/stretchr/testify/assert"
26 26
 )

+ 1
- 1
commands/version.go View File

@@ -17,7 +17,7 @@ import (
17 17
 	"fmt"
18 18
 	"strconv"
19 19
 
20
-	"github.com/bryanl/doit"
20
+	"github.com/digitalocean/doctl"
21 21
 	"github.com/spf13/cobra"
22 22
 )
23 23
 

+ 1
- 1
do/mocks/AccountService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 type AccountService struct {

+ 1
- 1
do/mocks/ActionsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 type ActionsService struct {

+ 1
- 1
do/mocks/DomainsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/DropletActionsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 type DropletActionsService struct {

+ 1
- 1
do/mocks/DropletsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/FloatingIPActionsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/FloatingIPsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/ImageActionsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/ImagesService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/KeysService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 import "github.com/digitalocean/godo"

+ 1
- 1
do/mocks/RegionsService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 type RegionsService struct {

+ 1
- 1
do/mocks/SizesService.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 
15 15
 package mocks
16 16
 
17
-import "github.com/bryanl/doit/do"
17
+import "github.com/digitalocean/doctl/do"
18 18
 import "github.com/stretchr/testify/mock"
19 19
 
20 20
 type SizesService struct {

+ 2
- 2
doit.go View File

@@ -24,8 +24,8 @@ import (
24 24
 	"strings"
25 25
 
26 26
 	"github.com/blang/semver"
27
-	"github.com/bryanl/doit/pkg/runner"
28
-	"github.com/bryanl/doit/pkg/ssh"
27
+	"github.com/digitalocean/doctl/pkg/runner"
28
+	"github.com/digitalocean/doctl/pkg/ssh"
29 29
 	"github.com/digitalocean/godo"
30 30
 	jww "github.com/spf13/jwalterweatherman"
31 31
 	"github.com/spf13/viper"

+ 2
- 2
pkg/ssh/ssh.go View File

@@ -18,8 +18,8 @@ import (
18 18
 	"os"
19 19
 	"runtime"
20 20
 
21
-	"github.com/bryanl/doit/pkg/runner"
22
-	"github.com/bryanl/doit/pkg/term"
21
+	"github.com/digitalocean/doctl/pkg/runner"
22
+	"github.com/digitalocean/doctl/pkg/term"
23 23
 	"golang.org/x/crypto/ssh"
24 24
 )
25 25
 

+ 1
- 1
pkg/system/meminfo_linux.go View File

@@ -7,7 +7,7 @@ import (
7 7
 	"strconv"
8 8
 	"strings"
9 9
 
10
-	"github.com/bryanl/doit/pkg/units"
10
+	"github.com/digitalocean/doctlpkg/units"
11 11
 )
12 12
 
13 13
 // ReadMemInfo retrieves memory statistics of the host system and returns a

+ 1
- 1
pkg/system/meminfo_unix_test.go View File

@@ -6,7 +6,7 @@ import (
6 6
 	"strings"
7 7
 	"testing"
8 8
 
9
-	"github.com/bryanl/doit/pkg/units"
9
+	"github.com/digitalocean/doctlpkg/units"
10 10
 )
11 11
 
12 12
 // TestMemInfo tests parseMemInfo with a static meminfo string

+ 2
- 2
pkg/term/term_windows.go View File

@@ -11,8 +11,8 @@ import (
11 11
 
12 12
 	"github.com/Azure/go-ansiterm/winterm"
13 13
 	"github.com/Sirupsen/logrus"
14
-	"github.com/bryanl/doit/pkg/system"
15
-	"github.com/bryanl/doit/pkg/term/windows"
14
+	"github.com/digitalocean/doctlpkg/system"
15
+	"github.com/digitalocean/doctlpkg/term/windows"
16 16
 )
17 17
 
18 18
 // State holds the console mode for the terminal.

+ 1
- 1
scripts/build.sh View File

@@ -2,4 +2,4 @@
2 2
 
3 3
 set -eo pipefail
4 4
 
5
-go build -ldflags "-X github.com/bryanl/doit.Build=`git rev-parse --short HEAD`" github.com/bryanl/doit/cmd/doctl
5
+go build -ldflags "-X github.com/digitalocean/doctlBuild=`git rev-parse --short HEAD`" github.com/digitalocean/doctlcmd/doctl

+ 2
- 2
scripts/stage.sh View File

@@ -17,7 +17,7 @@ if [[ -n "$label" ]]; then
17 17
   ver="${ver}-${label}"
18 18
 fi
19 19
 
20
-RELEASE_PACKAGE=github.com/bryanl/doit/cmd/doctl
20
+RELEASE_PACKAGE=github.com/digitalocean/doctlcmd/doctl
21 21
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
22 22
 OUTPUT_DIR="${DIR}/../builds/${ver}"
23 23
 STAGE_DIR=$OUTPUT_DIR/stage
@@ -29,7 +29,7 @@ rm -f $STAGE_DIR/doctl $STAGE_DIR/doctl.exe
29 29
 
30 30
 if [[ -z $SKIPBUILD ]]; then
31 31
   echo "building doctl"
32
-  baseFlag="-X github.com/bryanl/doit"
32
+  baseFlag="-X github.com/digitalocean/doctl
33 33
   ldflags="${baseFlag}.Build=$(git rev-parse --short HEAD) $baseFlag.Major=${major} $baseFlag.Minor=${minor} $baseFlag.Patch=${patch}"
34 34
   if [[ -n "$label" ]]; then
35 35
     ldflags="${ldflags} $baseFlag.Label=${label}"

+ 1
- 1
util.go View File

@@ -14,7 +14,7 @@ limitations under the License.
14 14
 package doit
15 15
 
16 16
 import (
17
-	"github.com/bryanl/doit/pkg/runner"
17
+	"github.com/digitalocean/doctl/pkg/runner"
18 18
 	"golang.org/x/oauth2"
19 19
 )
20 20