add icon to macos app

artwork/icon.svg

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   fill="none"
+   stroke="currentColor"
+   stroke-width="2"
+   stroke-linecap="round"
+   stroke-linejoin="round"
+   class="feather feather-anchor"
+   version="1.1"
+   id="svg905"
+   sodipodi:docname="icon.svg"
+   inkscape:version="1.0.1 (c497b03c, 2020-09-10)"
+   inkscape:export-filename="/Users/nkanaev/Desktop/icon.png"
+   inkscape:export-xdpi="2048"
+   inkscape:export-ydpi="2048">
+  <metadata
+     id="metadata911">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs909">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 24 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="48 : 24 : 1"
+       inkscape:persp3d-origin="24 : 16 : 1"
+       id="perspective842" />
+  </defs>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1440"
+     inkscape:window-height="900"
+     id="namedview907"
+     showgrid="false"
+     inkscape:zoom="4.9128436"
+     inkscape:cx="30.960444"
+     inkscape:cy="52.71331"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg905"
+     inkscape:document-rotation="0" />
+  <rect
+     style="fill:#212529;stroke:none;stroke-width:3;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill-opacity:1"
+     id="rect913"
+     width="48"
+     height="48"
+     x="0"
+     y="0"
+     ry="24"
+     rx="0" />
+  <g
+     id="g940"
+     transform="matrix(1.4545455,0,0,1.4545455,6.545454,6.545454)"
+     style="fill:none;stroke:#ffffff;stroke-opacity:1">
+    <circle
+       cx="12"
+       cy="5"
+       id="circle899"
+       r="3"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
+    <line
+       x1="12"
+       y1="22"
+       x2="12"
+       y2="8"
+       id="line901"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
+    <path
+       d="M 5,12 H 2 a 10,10 0 0 0 20,0 h -3"
+       id="path903"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1" />
+  </g>
+</svg>

makefile

@@ -13,6 +13,7 @@ build_macos: bundle
 	set GOARCH=amd64
 	mkdir -p _output/macos
 	go build -tags "sqlite_foreign_keys release macos" -ldflags="-s -w" -o _output/macos/yarr main.go
+	cp artwork/icon.png _output/macos/icon.png
 	go run scripts/package_macos.go _output/macos
 
 build_linux: bundle

scripts/package_macos.go

@@ -3,7 +3,11 @@ package main
 import (
 	"os"
 	"path"
+	"fmt"
 	"io/ioutil"
+	"os/exec"
+	"strconv"
+	"log"
 )
 
 var plist = `<?xml version="1.0" encoding="UTF-8"?>
@@ -24,9 +28,7 @@ var plist = `<?xml version="1.0" encoding="UTF-8"?>
 	<string>yarr</string>
 
 	<key>CFBundleIconFile</key>
-	<string>AppIcon</string>
+	<string>icon</string>
-	<key>CFBundleIconName</key>
-	<string>AppIcon</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.news</string>
 
@@ -48,19 +50,49 @@ var plist = `<?xml version="1.0" encoding="UTF-8"?>
 </plist>
 `
 
+func run(cmd ...string) {
+	fmt.Println(cmd)
+	err := exec.Command(cmd[0], cmd[1:]...).Run()
+	if err != nil {
+		log.Fatal(err)
+	}
+}
+
 func main() {
 	outdir := os.Args[1]
 	outfile := "yarr"
 
 	binDir := path.Join(outdir, "yarr.app", "Contents/MacOS")
 	resDir := path.Join(outdir, "yarr.app", "Contents/Resources")
-	plistPath := path.Join(outdir, "yarr.app", "Contents/Info.plist")
+
+	plistFile := path.Join(outdir, "yarr.app", "Contents/Info.plist")
+	pkginfoFile := path.Join(outdir, "yarr.app", "Contents/PkgInfo")
 
 	os.MkdirAll(binDir, 0700)
 	os.MkdirAll(resDir, 0700)
 
 	f, _ := ioutil.ReadFile(path.Join(outdir, outfile))
-	ioutil.WriteFile(path.Join(binDir, outfile), f, 0700)
+	ioutil.WriteFile(path.Join(binDir, outfile), f, 0755)
 
-	ioutil.WriteFile(plistPath, []byte(plist), 0600)
+	ioutil.WriteFile(plistFile, []byte(plist), 0644)
+	ioutil.WriteFile(pkginfoFile, []byte("APPL????"), 0644)
+
+	iconFile := path.Join(outdir, "icon.png")
+	iconsetDir := path.Join(outdir, "icon.iconset")
+	os.Mkdir(iconsetDir, 0700)
+
+	for _, res := range []int{1024, 512, 256, 128, 64, 32, 16} {
+		outfile := fmt.Sprintf("icon_%dx%d.png", res, res)
+		if res == 1024 || res == 64 {
+			outfile = fmt.Sprintf("icon_%dx%d@2x.png", res / 2, res / 2)
+		}
+		cmd := []string {
+			"sips", "-s", "format", "png", "--resampleWidth", strconv.Itoa(res),
+			iconFile, "--out", path.Join(iconsetDir, outfile),
+		}
+		run(cmd...)
+	}
+
+	icnsFile := path.Join(resDir, "icon.icns")
+	run("iconutil", "-c", "icns", iconsetDir, "-o", icnsFile)
 }