Switch back to zellyn/kooky

Now that browserutils/kooky#5 is merged.
barnardb · May 15, 2019 · 0412955 · 0412955
1 parent a47b1c7
commit 0412955
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -6,13 +6,10 @@ outputting them in a format appropriate for use in the HTTP `Cookie` header.
 This is useful in some scripting situations.
 
 This core cookie reading code is provided by the [zellyn/kooky] cookie extraction library
-(currently using a [fork] that merges [zellyn/kooky #5] to support newer Firefox databases).
 This project wraps that library with some code to abstract browser differences away,
 filter for cookies that match a URL, and provide a command-line interface.
 
 [zellyn/kooky]: https://github.com/zellyn/kooky
-[fork]: https://github.com/barnardb/kooky
-[zellyn/kooky #5]: https://github.com/zellyn/kooky/pull/5
 
 
 - [Installing](#installing)

diff --git a/find.go b/find.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/barnardb/kooky"
+	"github.com/zellyn/kooky"
 	"log"
 	"net/url"
 	"strings"

diff --git a/format.go b/format.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/barnardb/kooky"
+	"github.com/zellyn/kooky"
 	"io"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,13 +1,13 @@
 module github.com/barnardb/cookies
 
 require (
-	github.com/barnardb/kooky v0.0.0-20190421003720-9117b6c656ce
 	github.com/go-sqlite/sqlite3 v0.0.0-20180313105335-53dd8e640ee7 // indirect
 	github.com/godbus/dbus v4.1.0+incompatible // indirect
 	github.com/gonuts/binary v0.2.0 // indirect
 	github.com/keybase/go-keychain v0.0.0-20190410171543-b4561aacec0d // indirect
 	github.com/spf13/pflag v1.0.3
 	github.com/stretchr/testify v1.3.0 // indirect
 	github.com/zalando/go-keyring v0.0.0-20190416082312-a1018b809165 // indirect
+	github.com/zellyn/kooky v0.0.0-20190514172626-f2bb24889ec7
 	golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480 // indirect
 )
diff --git a/go.sum b/go.sum
@@ -1,5 +1,3 @@
-github.com/barnardb/kooky v0.0.0-20190421003720-9117b6c656ce h1:My16TIuJftC/sxb3genPxpULlPE3XgVYhB4AbQsl8UU=
-github.com/barnardb/kooky v0.0.0-20190421003720-9117b6c656ce/go.mod h1:m1tY/UUilgNwFhzjvfKUo+vzze/TvSpRAvgk1RJGnEw=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -21,6 +19,8 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/zalando/go-keyring v0.0.0-20190416082312-a1018b809165 h1:PEUmYXUE4kiCdhP9nYln0j5ugPo4h/F1bWY6PavrCZ8=
 github.com/zalando/go-keyring v0.0.0-20190416082312-a1018b809165/go.mod h1:XlXBIfkGawHNVOHlenOaBW7zlfCh8LovwjOgjamYnkQ=
+github.com/zellyn/kooky v0.0.0-20190514172626-f2bb24889ec7 h1:wgs0+Ml8DOQbCBLlIPPjPdBUMQxRlhE6H4OmXRW6irY=
+github.com/zellyn/kooky v0.0.0-20190514172626-f2bb24889ec7/go.mod h1:45MAFn3o6erpJrzlrSmsJBaUNWhz5YyM9lxj/nyXDjM=
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480 h1:O5YqonU5IWby+w98jVUG9h7zlCWCcH4RHyPVReBmhzk=
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
diff --git a/load.go b/load.go
@@ -2,7 +2,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/barnardb/kooky"
+	"github.com/zellyn/kooky"
 	"os/user"
 	"path/filepath"
 	"strings"
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,7 +2,7 @@ package main @@
     import (
     	"fmt"
-    	"github.com/barnardb/kooky"
+    	"github.com/zellyn/kooky"
     	"io"
     )
@@ Expand Down @@