From e3875b956fd187594362b4af45665059073a1129 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Mon, 8 Jul 2019 11:05:19 -0400
Subject: [PATCH] tycho: convert gen_images.sh to fish

---
 tycho/gen_images.fish | 51 +++++++++++++++++++++++++++++++++++++++++++
 tycho/gen_images.sh   | 44 -------------------------------------
 2 files changed, 51 insertions(+), 44 deletions(-)
 create mode 100644 tycho/gen_images.fish
 delete mode 100644 tycho/gen_images.sh

diff --git a/tycho/gen_images.fish b/tycho/gen_images.fish
new file mode 100644
index 0000000..b645e50
--- /dev/null
+++ b/tycho/gen_images.fish
@@ -0,0 +1,51 @@
+#!/usr/bin/env fish
+
+set sizes 16 24 32 48 64 128 256 512 1024
+set hidpi 32 48 64 96 128 256 512 1024 2048
+set numsize 9
+
+mkdir -p resources/icons
+rm resources/icons/*.png resources/icons.qrc
+
+echo "<RCC>" > resources/icons.qrc
+echo '<qresource prefix="/tycho">' >> resources/icons.qrc
+
+function conv_icon -a out sz inf
+	inkscape -z -e "$out" -w "$sz" -h "$sz" "$inf" &
+end
+
+function run_optipng -a out
+	optipng -quiet -o5 "$out" &
+end
+
+function comp_icon -a f i
+	set sz $sizes[$i]
+	set hz $hidpi[$i]
+	set out icons/(basename -s .svg "$f")_$sz
+	set out_s $out.png
+	set out_h $out@2x.png
+	echo \t"<file>$out_s</file>" >> resources/icons.qrc
+	echo \t"<file>$out_h</file>" >> resources/icons.qrc
+	set out_s resources/$out_s
+	set out_h resources/$out_h
+	conv_icon "$out_s" "$sz" "$f"
+	conv_icon "$out_h" "$hz" "$f"
+	wait inkscape
+	run_optipng "$out_s"
+	run_optipng "$out_h"
+end
+
+for f in resources/mini/*.svg
+	for i in (seq 1 "$numsize")
+		comp_icon "$f" "$i"
+	end
+end
+
+echo "</qresource>" >> resources/icons.qrc
+echo "</RCC>" >> resources/icons.qrc
+
+wait optipng
+
+echo "done"
+
+## EOF
diff --git a/tycho/gen_images.sh b/tycho/gen_images.sh
deleted file mode 100644
index 1978a35..0000000
--- a/tycho/gen_images.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-sizes=(16 24 32 48 64 128 256 512 1024)
-hidpi=(32 48 64 96 128 256 512 1024 2048)
-numsize=8
-
-mkdir -p resources/icons
-rm resources/icons/*.png resources/icons.qrc
-
-echo "<RCC>" > resources/icons.qrc
-echo "<qresource prefix=\"/tycho\">" >> resources/icons.qrc
-
-comp_icon() {
-	f=$1
-	i=$2
-	sz=${sizes[${i}]}
-	hz=${hidpi[${i}]}
-	out=icons/$(basename -s .svg "${f}")_${sz}
-	out_s=${out}.png
-	out_h=${out}@2x.png
-	echo "	<file>${out_s}</file>" >> resources/icons.qrc
-	echo "	<file>${out_h}</file>" >> resources/icons.qrc
-	out_s=resources/${out_s}
-	out_h=resources/${out_h}
-	echo "${out_s}"
-	convert -background none "${f}" -resize "${sz}x${sz}" "${out_s}" &
-	convert -background none "${f}" -resize "${hz}x${hz}" "${out_h}" &
-	wait
-	optipng -quiet -o5 "${out_s}" &
-	optipng -quiet -o5 "${out_h}" &
-}
-
-for f in resources/mini/*.svg
-do
-	for i in $(seq 0 "${numsize}")
-	do
-		comp_icon "${f}" "${i}"
-	done
-done
-
-echo "</qresource>" >> resources/icons.qrc
-echo "</RCC>" >> resources/icons.qrc
-
-## EOF