[rebase] Fix errors; update dependencies

Argument must be []byte not string Don't commit bomtest.txt
frappexx · Aug 16, 2018 · 74d81ae · 74d81ae
1 parent 3a31b84
commit 74d81ae
Show file tree

Hide file tree

Showing 8 changed files with 113 additions and 73 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -43,4 +43,4 @@
 
 [[constraint]]
   branch = "master"
-  name = "https://github.com/spkg/bom"
+  name = "github.com/spkg/bom"
diff --git a/pkg/gui/view_helpers.go b/pkg/gui/view_helpers.go
@@ -192,7 +192,7 @@ func (gui *Gui) renderString(g *gocui.Gui, viewName, s string) error {
 			return nil
 		}
 		v.Clear()
-		fmt.Fprint(v, bom.Clean(s))
+		fmt.Fprint(v, bom.Clean([]byte(s)))
 		v.Wrap = true
 		return nil
 	})

diff --git a/test/repos/bom.sh b/test/repos/bom.sh
@@ -3,7 +3,8 @@ set -ex; rm -rf repo; mkdir repo; cd repo
 
 git init
 
-cat <<EOT >> bomtest.txt A,B,C,D,E
+cat <<EOT >> bomtest.txt
+A,B,C,D,E
 F,G,H,I,J
 K,L,M,N,O
 P,Q,R,S,T

diff --git a/vendor/github.com/spkg/bom/LICENSE.md b/vendor/github.com/spkg/bom/LICENSE.md
diff --git a/vendor/github.com/spkg/bom/bom.go b/vendor/github.com/spkg/bom/bom.go
diff --git a/vendor/github.com/spkg/bom/discard_go14.go b/vendor/github.com/spkg/bom/discard_go14.go