From e22cde370b4adcc68833f91afeb2b20bc21d83b1 Mon Sep 17 00:00:00 2001
From: Florian Didron <0x6664@hey.com>
Date: Wed, 29 Dec 2021 10:20:54 +0900
Subject: fix: change spinner package to an OSS licenced one

---
 .gitignore |  3 +++
 go.mod     |  3 +--
 go.sum     | 14 +++++++++-----
 main.go    | 13 +++++++------
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5ed5dc..7552434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 wally-cli
+.idea
+*.bin
+*.hex
diff --git a/go.mod b/go.mod
index a51082d..e012f8b 100644
--- a/go.mod
+++ b/go.mod
@@ -3,9 +3,8 @@ module github.com/zsa/wally-cli
 go 1.14
 
 require (
-	github.com/caarlos0/spin v1.1.0
+	github.com/briandowns/spinner v1.18.0
 	github.com/google/gousb v2.1.0+incompatible
-	github.com/logrusorgru/aurora v2.0.3+incompatible
 	github.com/marcinbor85/gohex v0.0.0-20200531163658-baab2527a9a2
 	github.com/mattn/go-runewidth v0.0.9 // indirect
 	golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect
diff --git a/go.sum b/go.sum
index 3ed918e..91addcb 100644
--- a/go.sum
+++ b/go.sum
@@ -1,14 +1,18 @@
-github.com/caarlos0/spin v1.1.0 h1:EjsfGbZJejib25BPnDqf7iL2z9RUna7refvUf+AN9UE=
-github.com/caarlos0/spin v1.1.0/go.mod h1:HOC4pUvfhjXR2yDt+sEY9dRc2m4CCaK5z5oQYAbzXSA=
-github.com/google/gousb v1.1.0 h1:s/970WE1z968MC+dtWbuxDHCcx9kwANQo6UcZtfTfx0=
+github.com/briandowns/spinner v1.18.0 h1:SJs0maNOs4FqhBwiJ3Gr7Z1D39/rukIVGQvpNZVHVcM=
+github.com/briandowns/spinner v1.18.0/go.mod h1:QOuQk7x+EaDASo80FEXwlwiA+j/PPIcX3FScO+3/ZPQ=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/google/gousb v2.1.0+incompatible h1:ApzMDjF3FeO219QwWybJxYfFhXQzPLOEy0o+w9k5DNI=
 github.com/google/gousb v2.1.0+incompatible/go.mod h1:Tl4HdAs1ThE3gECkNwz+1MWicX6FXddhJEw7L8jRDiI=
-github.com/logrusorgru/aurora v2.0.3+incompatible h1:tOpm7WcpBTn4fjmVfgpQq0EfczGlG91VSDkswnjF5A8=
-github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod h1:7rIyQOR62GCctdiQpZ/zOJlFyk6y+94wXzv6RNZgaR4=
 github.com/marcinbor85/gohex v0.0.0-20200531163658-baab2527a9a2 h1:n7R8fUwWZUB2XtyzBNsYNNm9/XgOBj6pvLi7GLMCHtM=
 github.com/marcinbor85/gohex v0.0.0-20200531163658-baab2527a9a2/go.mod h1:Pb6XcsXyropB9LNHhnqaknG/vEwYztLkQzVCHv8sQ3M=
+github.com/mattn/go-colorable v0.1.2 h1:/bC9yWikZXAL9uJdulbSfyVNIR3n3trXl+v8+1sx8mU=
+github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
+github.com/mattn/go-isatty v0.0.8 h1:HLtExJ+uU2HOZ+wI0Tt5DtUDrx8yhUqDcp7fYERX4CE=
+github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0=
 github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
+golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d h1:L/IKR6COd7ubZrs2oTnTi73IhgqJ71c9s80WsQnh0Es=
 golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 gopkg.in/cheggaaa/pb.v1 v1.0.28 h1:n1tBJnnK2r7g9OW2btFH91V92STTUevLXYFb8gy9EMk=
diff --git a/main.go b/main.go
index e1a9c82..a81339a 100644
--- a/main.go
+++ b/main.go
@@ -3,13 +3,12 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/briandowns/spinner"
+	"gopkg.in/cheggaaa/pb.v1"
 	"net/url"
 	"os"
 	"path/filepath"
 	"time"
-
-	"github.com/caarlos0/spin"
-	"gopkg.in/cheggaaa/pb.v1"
 )
 
 var appVersion = "2.0.0"
@@ -61,8 +60,10 @@ func main() {
 		os.Exit(1)
 	}
 
-	spinner := spin.New("%s Press the reset button of your keyboard.")
-	spinner.Start()
+	sp := spinner.New(spinner.CharSets[9], 100*time.Millisecond)
+	sp.Suffix = " Press the reset button of your keyboard."
+
+	sp.Start()
 	spinnerStopped := false
 
 	var progress *pb.ProgressBar
@@ -80,7 +81,7 @@ func main() {
 		time.Sleep(500 * time.Millisecond)
 		if s.step > 0 {
 			if spinnerStopped == false {
-				spinner.Stop()
+				sp.Stop()
 				spinnerStopped = true
 			}
 			if progressStarted == false {
-- 
cgit v1.2.3