From 1c40e1083cf3a7c6048673d2b0f4e2f7ecc19692 Mon Sep 17 00:00:00 2001
From: Anders Pitman <tapitman11@gmail.com>
Date: Wed, 4 Nov 2020 09:28:10 -0700
Subject: [PATCH] Fix logo embedding

---
 release/Dockerfile             |  2 +-
 scripts/build_all_platforms.sh | 14 --------------
 scripts/build_release.sh       | 15 +++++++++++++++
 scripts/generate_logo.sh       |  2 +-
 4 files changed, 17 insertions(+), 16 deletions(-)
 delete mode 100755 scripts/build_all_platforms.sh

diff --git a/release/Dockerfile b/release/Dockerfile
index aed3950..6504fa9 100644
--- a/release/Dockerfile
+++ b/release/Dockerfile
@@ -4,7 +4,7 @@
 
 FROM ubuntu:16.04
 
-RUN apt-get update && apt-get install -y curl git
+RUN apt-get update && apt-get install -y curl git inkscape
 
 RUN git clone https://github.com/boringproxy/boringproxy
 WORKDIR boringproxy
diff --git a/scripts/build_all_platforms.sh b/scripts/build_all_platforms.sh
deleted file mode 100755
index 90261c1..0000000
--- a/scripts/build_all_platforms.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-function buildArch {
-    echo Building platform $1-$2
-    GOOS=$1 GOARCH=$2 go build -o build/boringproxy-$1-$2$3
-}
-
-buildArch linux amd64
-buildArch linux arm
-buildArch linux arm64
-
-buildArch windows amd64 .exe
-
-buildArch darwin amd64
diff --git a/scripts/build_release.sh b/scripts/build_release.sh
index 13e6cd9..3039923 100755
--- a/scripts/build_release.sh
+++ b/scripts/build_release.sh
@@ -2,8 +2,23 @@
 
 version=$(git describe --tags)
 
+function buildArch {
+    echo Building platform $1-$2
+    GOOS=$1 GOARCH=$2 go build -o build/boringproxy-$1-$2$3
+}
+
+./scripts/generate_logo.sh
+
 rice embed-go
 
+buildArch linux amd64
+buildArch linux arm
+buildArch linux arm64
+
+buildArch windows amd64 .exe
+
+buildArch darwin amd64
+
 ./scripts/build_all_platforms.sh
 
 tar -czf ./boringproxy_${version}.tar.gz build/
diff --git a/scripts/generate_logo.sh b/scripts/generate_logo.sh
index 51423f8..89b6c95 100755
--- a/scripts/generate_logo.sh
+++ b/scripts/generate_logo.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-inkscape -w 192 -h 192 logo.svg --export-filename webui/logo.png
+inkscape -z -w 192 -h 192 logo.svg -e webui/logo.png