change pkg name

joefour · Oct 9, 2022 · f204083 · f204083
1 parent b21bf0d
commit f204083
Show file tree

Hide file tree

Showing 96 changed files with 269 additions and 413 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "nrf-connect.toolchain.path": "${nrf-connect.toolchain:2.1.0}"
+}
diff --git a/README.md b/README.md
@@ -32,6 +32,6 @@ published at http://mynewt.apache.org/latest/os/modules/devmgmt/newtmgr.html
 Build the newtmgr tool as follows:
 
 1. Unpack newtmgr source.
-2. Rename resulting `apache-mynewt-newtmgr-1.9.0` directory to `$GOPATH/src/mynewt.apache.org/newtmgr`
-3. `cd $GOPATH/src/mynewt.apache.org/newtmgr/newtmgr`
+2. Rename resulting `apache-mynewt-newtmgr-1.9.0` directory to `$GOPATH/src/github.com/joefour/mynewt-newtmgr`
+3. `cd $GOPATH/src/github.com/joefour/mynewt-newtmgr/newtmgr`
 4. `GO111MODULE=on go build`
diff --git a/docs/install/install_linux.rst b/docs/install/install_linux.rst
@@ -168,15 +168,15 @@ install the latest release version of newtmgr from source.
 
    .. code-block:: console
 
-      $ go get mynewt.apache.org/newtmgr/newtmgr
+      $ go get github.com/joefour/mynewt-newtmgr/newtmgr
       $ ls -l /tmp/go/bin/newtmgr
       -rwxr-xr-x  1 user staff  17884488 Jul 29 16:25 /tmp/go/bin/newtmgr
 
 4. Check out the source from the latest release version:
 
    .. code-block:: console
 
-      $ cd src/mynewt.apache.org/newtmgr
+      $ cd src/github.com/joefour/mynewt-newtmgr
       $ git checkout mynewt_1_4_1_tag
       Note: checking out 'mynewt_1_4_1_tag'.
 

diff --git a/docs/install/install_windows.rst b/docs/install/install_windows.rst
@@ -86,7 +86,7 @@ build and install the latest release version of newtmgr from source.
    .. code-block:: console
 
 
-      $ go get mynewt.apache.org/newtmgr/newtmgr
+      $ go get github.com/joefour/mynewt-newtmgr/newtmgr
 
    **Note** If you get the following error, you may ignore it as we will
    rebuild newtmgr from the latest release version of newtmgr in the next
@@ -101,7 +101,7 @@ build and install the latest release version of newtmgr from source.
 
    .. code-block:: console
 
-      $ cd src/mynewt.apache.org/newtmgr
+      $ cd src/github.com/joefour/mynewt-newtmgr
       $ git checkout mynewt_1_4_1_tag
       Note: checking out 'mynewt_1_4_1_tag'.
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module mynewt.apache.org/newtmgr
+module github.com/joefour/mynewt-newtmgr
 
 go 1.12
 
@@ -7,20 +7,16 @@ require (
 	github.com/JuulLabs-OSS/cbgo v0.0.1
 	github.com/abiosoft/ishell v2.0.0+incompatible // indirect
 	github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db // indirect
-	github.com/cheggaaa/pb v2.0.7+incompatible // indirect
 	github.com/chzyer/logex v1.1.10 // indirect
-	github.com/chzyer/readline v0.0.0-20171208011716-f6d7a1f6fbf3 // indirect
 	github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1 // indirect
 	github.com/colinrgodsey/serial v0.0.0-20200722230255-f7ada0eda9cb
-	github.com/cosiner/argv v0.0.1 // indirect
 	github.com/fatih/color v1.7.0 // indirect
 	github.com/fatih/structs v1.1.0
 	github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
 	github.com/joaojeronimo/go-crc16 v0.0.0-20140729130949-59bd0194935e
 	github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect
 	github.com/mattn/go-runewidth v0.0.6 // indirect
 	github.com/mitchellh/go-homedir v1.1.0
-	github.com/peterh/liner v1.1.0 // indirect
 	github.com/pkg/errors v0.8.1
 	github.com/raff/goble v0.0.0-20200327175727-d63360dcfd80 // indirect
 	github.com/runtimeco/go-coap v0.0.0-20190911184520-8e5532820fc0
@@ -29,17 +25,9 @@ require (
 	github.com/spf13/cobra v0.0.5
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/ugorji/go/codec v1.1.7
-	go.starlark.net v0.0.0-20190919145610-979af19b165c // indirect
-	golang.org/x/arch v0.0.0-20190927153633-4e8777c89be4 // indirect
 	golang.org/x/net v0.0.0-20191119073136-fc4aabc6c914
-	gopkg.in/VividCortex/ewma.v1 v1.1.1 // indirect
 	gopkg.in/abiosoft/ishell.v2 v2.0.0
 	gopkg.in/cheggaaa/pb.v1 v1.0.28
-	gopkg.in/cheggaaa/pb.v2 v2.0.7 // indirect
-	gopkg.in/fatih/color.v1 v1.7.0 // indirect
-	gopkg.in/mattn/go-colorable.v0 v0.1.0 // indirect
-	gopkg.in/mattn/go-isatty.v0 v0.0.4 // indirect
-	gopkg.in/mattn/go-runewidth.v0 v0.0.4 // indirect
 	gopkg.in/yaml.v2 v2.2.4 // indirect
 	mynewt.apache.org/newt v0.0.0-20200409145402-c5d1e422bfa3
 )
diff --git a/go.sum b/go.sum
diff --git a/newtmgr/bll/bll_common.go b/newtmgr/bll/bll_common.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /**
@@ -25,10 +26,10 @@ import (
 	"runtime"
 	"time"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/JuulLabs-OSS/ble"
+	log "github.com/sirupsen/logrus"
 
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
 )
 
 func exchangeMtu(cln ble.Client, preferredMtu uint16) (uint16, error) {

diff --git a/newtmgr/bll/bll_sesn.go b/newtmgr/bll/bll_sesn.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /**
@@ -31,15 +32,15 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/net/context"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/mgmt"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmble"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmcoap"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmp"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmxutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
-	"mynewt.apache.org/newtmgr/nmxact/mgmt"
-	"mynewt.apache.org/newtmgr/nmxact/nmble"
-	"mynewt.apache.org/newtmgr/nmxact/nmcoap"
-	"mynewt.apache.org/newtmgr/nmxact/nmp"
-	"mynewt.apache.org/newtmgr/nmxact/nmxutil"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
 )
 
 // A session that uses the host machine's native BLE support.

diff --git a/newtmgr/bll/bll_sesn_cfg.go b/newtmgr/bll/bll_sesn_cfg.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /**
@@ -26,8 +27,8 @@ import (
 
 	"github.com/JuulLabs-OSS/ble"
 
-	"mynewt.apache.org/newtmgr/nmxact/nmcoap"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmcoap"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
 )
 
 type BllSesnCfg struct {

diff --git a/newtmgr/bll/bll_sesn_cfg_windows.go b/newtmgr/bll/bll_sesn_cfg_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /**
@@ -24,8 +25,8 @@ package bll
 import (
 	"time"
 
-	"mynewt.apache.org/newtmgr/nmxact/nmcoap"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmcoap"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
 )
 
 type BllSesnCfg struct {

diff --git a/newtmgr/bll/bll_util.go b/newtmgr/bll/bll_util.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /**
@@ -27,7 +28,7 @@ import (
 
 	"github.com/JuulLabs-OSS/ble"
 
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
 )
 
 func UuidFromBllUuid(bllUuid ble.UUID) (bledefs.BleUuid, error) {

diff --git a/newtmgr/bll/bll_xport.go b/newtmgr/bll/bll_xport.go
@@ -1,3 +1,4 @@
+//go:build !windows
 // +build !windows
 
 /**
@@ -26,8 +27,8 @@ import (
 
 	"github.com/JuulLabs-OSS/ble"
 	"github.com/JuulLabs-OSS/ble/examples/lib/dev"
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
 )
 
 type XportCfg struct {

diff --git a/newtmgr/bll/bll_xport_linux.go b/newtmgr/bll/bll_xport_linux.go
@@ -1,3 +1,4 @@
+//go:build linux
 // +build linux
 
 /**
@@ -26,8 +27,8 @@ import (
 	"github.com/JuulLabs-OSS/ble/linux"
 	"github.com/JuulLabs-OSS/ble/linux/hci/cmd"
 
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
 )
 
 func BllXportSetConnParams(dev ble.Device, ownAddrType bledefs.BleAddrType) error {

diff --git a/newtmgr/bll/bll_xport_nonlinux.go b/newtmgr/bll/bll_xport_nonlinux.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 /**
@@ -24,7 +25,7 @@ package bll
 import (
 	"github.com/JuulLabs-OSS/ble"
 
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
 )
 
 // macOS (CoreBluetooth) does not allow the connection parameters to be

diff --git a/newtmgr/bll/bll_xports_windows.go b/newtmgr/bll/bll_xports_windows.go
@@ -1,3 +1,4 @@
+//go:build windows
 // +build windows
 
 /**
@@ -24,8 +25,8 @@ package bll
 import (
 	"fmt"
 
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
-	"mynewt.apache.org/newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/bledefs"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
 )
 
 type XportCfg struct {
@@ -40,13 +41,13 @@ func NewXportCfg() XportCfg {
 }
 
 type BllXport struct {
-	cfg XportCfg
+	cfg    XportCfg
 	hciIdx int
 }
 
 func NewBllXport(cfg XportCfg, hciIdx int) *BllXport {
 	return &BllXport{
-		cfg: cfg,
+		cfg:    cfg,
 		hciIdx: hciIdx,
 	}
 }

diff --git a/newtmgr/cli/commands.go b/newtmgr/cli/commands.go
@@ -25,9 +25,9 @@ import (
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmxutil"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/nmxutil"
 )
 
 var NewtmgrLogLevel log.Level

diff --git a/newtmgr/cli/common.go b/newtmgr/cli/common.go
@@ -24,17 +24,17 @@ import (
 
 	log "github.com/sirupsen/logrus"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/bll"
+	"github.com/joefour/mynewt-newtmgr/newtmgr/config"
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/mtech_lora"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmble"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmcoap"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmserial"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/udp"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xport"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/bll"
-	"mynewt.apache.org/newtmgr/newtmgr/config"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/mtech_lora"
-	"mynewt.apache.org/newtmgr/nmxact/nmble"
-	"mynewt.apache.org/newtmgr/nmxact/nmcoap"
-	"mynewt.apache.org/newtmgr/nmxact/nmserial"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
-	"mynewt.apache.org/newtmgr/nmxact/udp"
-	"mynewt.apache.org/newtmgr/nmxact/xport"
 )
 
 var globalSesn sesn.Sesn

diff --git a/newtmgr/cli/config.go b/newtmgr/cli/config.go
@@ -24,10 +24,10 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 func configRead(s sesn.Sesn, args []string) {

diff --git a/newtmgr/cli/connprofile.go b/newtmgr/cli/connprofile.go
@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/config"
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/config"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
 
 	"github.com/spf13/cobra"
 )

diff --git a/newtmgr/cli/crash.go b/newtmgr/cli/crash.go
@@ -25,9 +25,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 func crashRunCmd(cmd *cobra.Command, args []string) {

diff --git a/newtmgr/cli/datetime.go b/newtmgr/cli/datetime.go
@@ -25,10 +25,10 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/sesn"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/sesn"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 func dateTimeRead(s sesn.Sesn) error {

diff --git a/newtmgr/cli/echo.go b/newtmgr/cli/echo.go
@@ -24,9 +24,9 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 func echoRunCmd(cmd *cobra.Command, args []string) {

diff --git a/newtmgr/cli/fs.go b/newtmgr/cli/fs.go
@@ -26,10 +26,10 @@ import (
 
 	"github.com/spf13/cobra"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmp"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/nmp"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 func fsDownloadRunCmd(cmd *cobra.Command, args []string) {

diff --git a/newtmgr/cli/image.go b/newtmgr/cli/image.go
@@ -29,11 +29,11 @@ import (
 	"github.com/spf13/cobra"
 	pb "gopkg.in/cheggaaa/pb.v1"
 
+	"github.com/joefour/mynewt-newtmgr/newtmgr/core"
+	"github.com/joefour/mynewt-newtmgr/newtmgr/nmutil"
+	"github.com/joefour/mynewt-newtmgr/nmxact/nmp"
+	"github.com/joefour/mynewt-newtmgr/nmxact/xact"
 	"mynewt.apache.org/newt/util"
-	"mynewt.apache.org/newtmgr/newtmgr/core"
-	"mynewt.apache.org/newtmgr/newtmgr/nmutil"
-	"mynewt.apache.org/newtmgr/nmxact/nmp"
-	"mynewt.apache.org/newtmgr/nmxact/xact"
 )
 
 var (