From: Ramakrishnan Muthukrishnan <ram@leastauthority.com>
Date: Thu, 16 Apr 2015 15:36:26 +0000 (+0530)
Subject: fix OS X logo generation
X-Git-Tag: allmydata-tahoe-1.10.1a1~23
X-Git-Url: https://git.rkrishnan.org/vdrive/%5B/%5D%20/uri/quickstart.html?a=commitdiff_plain;h=96d26142664e55262c8b2496173c05c78065539a;p=tahoe-lafs%2Ftahoe-lafs.git

fix OS X logo generation
---

diff --git a/misc/build_helpers/icons/make-osx-icon.sh b/misc/build_helpers/icons/make-osx-icon.sh
index fc81a5d2..acadd11d 100755
--- a/misc/build_helpers/icons/make-osx-icon.sh
+++ b/misc/build_helpers/icons/make-osx-icon.sh
@@ -8,20 +8,20 @@ if [[ "$#" -eq 0 ]]; then
     exit 0
 fi
 
-temp="$(mktemp -d)"
+temp="$(pwd)/temp"
 declare -a res=(16 32 64 128 256 512 1024)
 for f in "$*"; do
     name="`basename -s .svg "$f"`"
     iconset="$temp/${name}.iconset"
     mkdir -p "$iconset"
     for r in "${res[@]}"; do
-        inkscape -z -e "$iconset/${name}${r}x${r}.png" -w "$r" -h "$r" "$f"
+        inkscape -z -e "$iconset/icon_${r}x${r}.png" -w "$r" -h "$r" "$f"
     done
-    ln "$iconset/${name}32x32.png" "$iconset/${name}16x16@2x.png"
-    mv "$iconset/${name}64x64.png" "$iconset/${name}32x32@2x.png"
-    ln "$iconset/${name}256x256.png" "$iconset/${name}128x128@2x.png"
-    ln "$iconset/${name}512x512.png" "$iconset/${name}256x256@2x.png"
-    mv "$iconset/${name}1024x1024.png" "$iconset/${name}512x512@2x.png"
+    ln "$iconset/icon_32x32.png" "$iconset/icon_16x16@2x.png"
+    mv "$iconset/icon_64x64.png" "$iconset/icon_32x32@2x.png"
+    ln "$iconset/icon_256x256.png" "$iconset/icon_128x128@2x.png"
+    ln "$iconset/icon_512x512.png" "$iconset/icon_256x256@2x.png"
+    mv "$iconset/icon_1024x1024.png" "$iconset/icon_512x512@2x.png"
     iconutil -c icns -o "${name}.icns" "$iconset"
 done
 rm -rf "$temp"