Merge remote-tracking branch 'origin/master' into master

arduino · Aug 17, 2020 · be48f59 · be48f59
2 parents 7d288f4 + 1e0d0ee
commit be48f59
Show file tree

Hide file tree

Showing 12 changed files with 36 additions and 34 deletions.
diff --git a/README.adoc b/README.adoc
@@ -6,7 +6,7 @@ Use this tool to update the firmware and/or add SSL certificates for any WINC, N
 
 You can download the Firmware/Certificates updater here:
 
-https://github.com/bcmi-labs/FirmwareUpdater/releases/latest
+https://github.com/arduino/FirmwareUpdater/releases/latest
 
 == Usage ==
 
@@ -48,7 +48,7 @@ The full list of command line options can be obtained with the `-h` option: `./u
 
 == How to build the tools from source file ==
 
- go get github.com/arduino-libraries/FirmwareUpdater/cli
+ go get github.com/arduino/FirmwareUpdater/cli
 
 This will create a bin folder with `cli` executable in it.
 

diff --git a/cli/main.go b/cli/main.go
@@ -8,11 +8,11 @@ import (
 	"os"
 	"strings"
 
-	"github.com/arduino-libraries/FirmwareUpdater/modules/nina"
-	"github.com/arduino-libraries/FirmwareUpdater/modules/sara"
-	"github.com/arduino-libraries/FirmwareUpdater/modules/winc"
-	"github.com/arduino-libraries/FirmwareUpdater/utils"
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/modules/nina"
+	"github.com/arduino/FirmwareUpdater/modules/sara"
+	"github.com/arduino/FirmwareUpdater/modules/winc"
+	"github.com/arduino/FirmwareUpdater/utils"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 )
 
 var ctx context.Context

diff --git a/distrib.sh b/distrib.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=`cd src/github.com/arduino-libraries/FirmwareUpdater/cli && git describe --tags`
+VERSION=`cd src/github.com/arduino/FirmwareUpdater/cli && git describe --tags`
 FILENAME="FirmwareUpdater"
 
 rm -rf distrib
@@ -13,22 +13,22 @@ mkdir -p distrib/windows
 
 export CGO_ENABLED=0
 
-GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater github.com/arduino-libraries/FirmwareUpdater/cli
-GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater github.com/arduino-libraries/FirmwareUpdater/cli
-GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater github.com/arduino-libraries/FirmwareUpdater/cli
-GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater github.com/arduino-libraries/FirmwareUpdater/cli
-GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe github.com/arduino-libraries/FirmwareUpdater/cli
+GOOS=linux GOARCH=amd64 go build -o distrib/linux64/updater github.com/arduino/FirmwareUpdater/cli
+GOOS=linux GOARCH=386 GO386=387 go build -o distrib/linux32/updater github.com/arduino/FirmwareUpdater/cli
+GOOS=linux GOARCH=arm go build -o distrib/linuxarm/updater github.com/arduino/FirmwareUpdater/cli
+GOOS=linux GOARCH=arm64 go build -o distrib/linuxarm64/updater github.com/arduino/FirmwareUpdater/cli
+GOOS=windows GOARCH=386 GO386=387 go build -o distrib/windows/updater.exe github.com/arduino/FirmwareUpdater/cli
 
 #export CGO_ENABLED=1
 # need osxcross in path
-GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater github.com/arduino-libraries/FirmwareUpdater/cli
+GOOS=darwin GOARCH=amd64 go build -o distrib/osx/updater github.com/arduino/FirmwareUpdater/cli
 
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linux64
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linux32
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linuxarm
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/linuxarm64
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/windows
-cp -r $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/firmwares distrib/osx
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux64
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linux32
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/linuxarm64
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/windows
+cp -r $GOPATH/src/github.com/arduino/FirmwareUpdater/firmwares distrib/osx
 
 cd distrib/linux64 && tar cjf ../${FILENAME}-${VERSION}-linux64.tar.bz2 * && cd -
 LINUX64_SHA=`sha256sum distrib/${FILENAME}-${VERSION}-linux64.tar.bz2 | cut -f1 -d " "`
@@ -59,7 +59,7 @@ echo "=============================="
 echo "BOARD MANAGER SNIPPET"
 echo "=============================="
 
-cat $GOPATH/src/github.com/arduino-libraries/FirmwareUpdater/extras/package_index.json.template |
+cat $GOPATH/src/github.com/arduino/FirmwareUpdater/extras/package_index.json.template |
 sed "s/%%VERSION%%/${VERSION}/" |
 sed "s/%%FILENAME%%/${FILENAME}/" |
 sed "s/%%LINUX64_SHA%%/${LINUX64_SHA}/" |

diff --git a/go.mod b/go.mod
@@ -1,4 +1,6 @@
-module github.com/arduino-libraries/FirmwareUpdater
+module github.com/arduino/FirmwareUpdater
+
+go 1.14
 
 require (
 	github.com/creack/goselect v0.0.0-20180501195510-58854f77ee8d // indirect

diff --git a/modules/nina/flasher.go b/modules/nina/flasher.go
@@ -22,7 +22,7 @@ package nina
 import (
 	"crypto/md5"
 	"encoding/binary"
-	"github.com/arduino-libraries/FirmwareUpdater/utils"
+	"github.com/arduino/FirmwareUpdater/utils"
 	"log"
 	"time"
 

diff --git a/modules/nina/main.go b/modules/nina/main.go
@@ -28,9 +28,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/arduino-libraries/FirmwareUpdater/programmers/avrdude"
-	"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/programmers/avrdude"
+	"github.com/arduino/FirmwareUpdater/programmers/bossac"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 )
 
 var f *Flasher

diff --git a/modules/sara/flasher.go b/modules/sara/flasher.go
@@ -20,7 +20,7 @@
 package sara
 
 import (
-	"github.com/arduino-libraries/FirmwareUpdater/utils"
+	"github.com/arduino/FirmwareUpdater/utils"
 	serial "github.com/facchinm/go-serial"
 	"log"
 	"strings"

diff --git a/modules/sara/main.go b/modules/sara/main.go
@@ -21,8 +21,8 @@ package sara
 
 import (
 	"fmt"
-	"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/programmers/bossac"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 	"io/ioutil"
 	"log"
 	"strconv"

diff --git a/modules/winc/flasher.go b/modules/winc/flasher.go
@@ -21,7 +21,7 @@ package winc
 
 import (
 	"encoding/binary"
-	"github.com/arduino-libraries/FirmwareUpdater/utils"
+	"github.com/arduino/FirmwareUpdater/utils"
 	serial "github.com/facchinm/go-serial"
 	"log"
 	"time"

diff --git a/modules/winc/main.go b/modules/winc/main.go
@@ -23,8 +23,8 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"github.com/arduino-libraries/FirmwareUpdater/programmers/bossac"
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/programmers/bossac"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 	"io/ioutil"
 	"log"
 	"os"

diff --git a/programmers/avrdude/avrdude.go b/programmers/avrdude/avrdude.go
@@ -8,7 +8,7 @@ import (
 	"os/exec"
 	"path/filepath"
 
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 	serial "go.bug.st/serial.v1"
 	//"go.bug.st/serial.v1/enumerator"
 	"time"

diff --git a/programmers/bossac/bossac.go b/programmers/bossac/bossac.go
@@ -3,7 +3,7 @@ package bossac
 import (
 	"bytes"
 	"errors"
-	"github.com/arduino-libraries/FirmwareUpdater/utils/context"
+	"github.com/arduino/FirmwareUpdater/utils/context"
 	serial "go.bug.st/serial.v1"
 	"io/ioutil"
 	"log"