commit 307d2e851b0af0bdd1ac3892780a27e82bfa306d
parent 01d9bc5d5ad6f1edf77bd3ca695b043c6cc01b8c
Author: Jack Mordaunt <jackmordaunt@gmail.com>
Date: Fri, 28 May 2021 20:16:06 +0800
build: migrate to v2
Signed-off-by: Jack Mordaunt <jackmordaunt@gmail.com>
Diffstat:
5 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/cmd/icnsify/main.go b/cmd/icnsify/main.go
@@ -10,7 +10,7 @@ import (
"path/filepath"
"strings"
- "github.com/jackmordaunt/icns"
+ "github.com/jackmordaunt/icns/v2"
"github.com/spf13/afero"
"github.com/spf13/pflag"
@@ -25,9 +25,24 @@ var (
func main() {
var (
- inputPath = pflag.StringP("input", "i", "", "Input image for conversion to icns from jpg|png or visa versa.")
- outputPath = pflag.StringP("output", "o", "", "Output path, defaults to <path/to/image>.(icns|png) depending on input.")
- resize = pflag.IntP("resize", "r", 5, "Quality of resize algorithm. Values range from 0 to 5, fastest to slowest execution time. Defaults to slowest for best quality.")
+ inputPath = pflag.StringP(
+ "input",
+ "i",
+ "",
+ "Input image for conversion to icns from jpg|png or visa versa.",
+ )
+ outputPath = pflag.StringP(
+ "output",
+ "o",
+ "",
+ "Output path, defaults to <path/to/image>.(icns|png) depending on input.",
+ )
+ resize = pflag.IntP(
+ "resize",
+ "r",
+ 5,
+ "Quality of resize algorithm. Values range from 0 to 5, fastest to slowest execution time. Defaults to slowest for best quality.",
+ )
)
pflag.Parse()
in, out, algorithm := sanitiseInputs(*inputPath, *outputPath, *resize)
diff --git a/cmd/preview/main.go b/cmd/preview/main.go
@@ -25,7 +25,7 @@ import (
"gioui.org/widget"
m "gioui.org/widget/material"
c "gioui.org/x/component"
- "github.com/jackmordaunt/icns"
+ "github.com/jackmordaunt/icns/v2"
"github.com/ncruces/zenity"
)
diff --git a/go.mod b/go.mod
@@ -1,17 +1,18 @@
-module github.com/jackmordaunt/icns
+module github.com/jackmordaunt/icns/v2
go 1.14
require (
- gioui.org v0.0.0-20210504193539-82fff0178bed
- gioui.org/x v0.0.0-20210503123353-221e50123e52
- github.com/ncruces/zenity v0.7.1
+ gioui.org v0.0.0-20210520085948-5f631209eadd
+ gioui.org/x v0.0.0-20210527203231-068422c6c9a4
+ github.com/akavel/rsrc v0.10.2 // indirect
+ github.com/ncruces/zenity v0.7.4
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
github.com/pkg/errors v0.9.1
github.com/spf13/afero v1.6.0
github.com/spf13/pflag v1.0.5
- golang.org/x/exp v0.0.0-20210503015746-b3083d562e1d // indirect
+ golang.org/x/exp v0.0.0-20210526181343-b47a03e3048a // indirect
golang.org/x/image v0.0.0-20210504121937-7319ad40d33e // indirect
- golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 // indirect
+ golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea // indirect
golang.org/x/text v0.3.6 // indirect
)
diff --git a/go.sum b/go.sum
@@ -1,14 +1,15 @@
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
gioui.org v0.0.0-20210402191542-ce7f0da06ee3/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
-gioui.org v0.0.0-20210504193539-82fff0178bed h1:2c1K4iYSB6EI4p73mAi1jGHF7U4UBd2j0fyTtRyE3Ko=
-gioui.org v0.0.0-20210504193539-82fff0178bed/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
-gioui.org/x v0.0.0-20210503123353-221e50123e52 h1:1H0waCS/cuKrEDmbv654gEoFOa79LJJ4vM0DnHyrLS4=
-gioui.org/x v0.0.0-20210503123353-221e50123e52/go.mod h1:qsAS5EBzGhn3sJ98FJdA+ae+E5/DgmxjySERjjR1Zvg=
+gioui.org v0.0.0-20210520085948-5f631209eadd h1:K7DD+eb3lqd2iginB8QFPgHaq7iekJXhiSVd0IDeR8k=
+gioui.org v0.0.0-20210520085948-5f631209eadd/go.mod h1:RSH6KIUZ0p2xy5zHDxgAM4zumjgTw83q2ge/PI+yyw8=
+gioui.org/x v0.0.0-20210527203231-068422c6c9a4 h1:O3Q+5C6iweEfiNzrYjaM0LuM2t+IR4I/8mppckWHp6w=
+gioui.org/x v0.0.0-20210527203231-068422c6c9a4/go.mod h1:qsAS5EBzGhn3sJ98FJdA+ae+E5/DgmxjySERjjR1Zvg=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/akavel/rsrc v0.8.0 h1:zjWn7ukO9Kc5Q62DOJCcxGpXC18RawVtYAGdz2aLlfw=
github.com/akavel/rsrc v0.8.0/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
+github.com/akavel/rsrc v0.10.2 h1:Zxm8V5eI1hW4gGaYsJQUhxpjkENuG91ki8B4zCrvEsw=
+github.com/akavel/rsrc v0.10.2/go.mod h1:uLoCtb9J+EyAqh+26kdrTgmzRBFPGOolLWKpdxkKq+c=
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
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=
@@ -28,8 +29,8 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/ncruces/zenity v0.7.1 h1:5NH2+vBGustysT74ja7mypqebdfUPZT8ZjEOVBzkhLg=
-github.com/ncruces/zenity v0.7.1/go.mod h1:hLx0V51wYZLka1atR6V1N9azD3/MyYseCUhQ3wnzflk=
+github.com/ncruces/zenity v0.7.4 h1:LAKPDqR71ODNZhWPPqIuRx6AzF0FM3sChu6aB1lLNWI=
+github.com/ncruces/zenity v0.7.4/go.mod h1:hLx0V51wYZLka1atR6V1N9azD3/MyYseCUhQ3wnzflk=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
@@ -71,8 +72,8 @@ golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL
golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
golang.org/x/exp v0.0.0-20191002040644-a1355ae1e2c3/go.mod h1:NOZ3BPKG0ec/BKJQgnvsSFpcKLM5xXVWnvZS97DWHgE=
golang.org/x/exp v0.0.0-20201229011636-eab1b5eb1a03/go.mod h1:I6l2HNBLBZEcrOoCpyKLdY2lHoRZ8lI4x60KMCQDft4=
-golang.org/x/exp v0.0.0-20210503015746-b3083d562e1d h1:GVdk3fETn7OIrVsO9oikNOn5qWu8EcgkTtcDD9IGyQ4=
-golang.org/x/exp v0.0.0-20210503015746-b3083d562e1d/go.mod h1:MSdmUWF4ZWBPSUbgUX/gaau5kvnbkSs9pgtY6B9JXDE=
+golang.org/x/exp v0.0.0-20210526181343-b47a03e3048a h1:15PzmCQfHRcBYKPW5s3hmJVO2H/SpTv5rsEh10maPMk=
+golang.org/x/exp v0.0.0-20210526181343-b47a03e3048a/go.mod h1:MSdmUWF4ZWBPSUbgUX/gaau5kvnbkSs9pgtY6B9JXDE=
golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
golang.org/x/image v0.0.0-20200618115811-c13761719519/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
@@ -108,8 +109,8 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20210304124612-50617c2ba197/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6 h1:cdsMqa2nXzqlgs183pHxtvoVwU7CyzaCTAUOg94af4c=
-golang.org/x/sys v0.0.0-20210503173754-0981d6026fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea h1:+WiDlPBBaO+h9vPNZi8uJ3k4BkKQB7Iow3aqwHVA5hI=
+golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
diff --git a/readme.md b/readme.md
@@ -19,6 +19,14 @@ Note: All icons within the `icns` are sized for high dpi retina screens, using t
`preview` is a gui for displaying `icns` files cross-platform.
+### Go Tool
+
+```
+go install github.com/jackmordaunt/icns/cmd/preview@latest
+```
+
+### Clone
+
```
git clone https://github.com/jackmordaunt/icns
cd icns && go install ./cmd/preview
@@ -30,6 +38,14 @@ Note: Gio cannot be cross-compiled right now, so there are no `preview` builds i
## Command Line
+### Go Tool
+
+```
+go install github.com/jackmordaunt/icns/cmd/icnsify@latest
+```
+
+### Clone
+
```
git clone https://github.com/jackmordaunt/icns
cd icns && go install ./cmd/icnsify
