From 8a2fdda9381c7651a3b2352745849c7a2ac15eda Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Tue, 1 Mar 2022 22:00:13 -0500
Subject: [PATCH] desktopToDarwinBundle: use Bash arithmetic

Co-authored-by: Uri Baghin <uri@canva.com>
---
 .../setup-hooks/desktop-to-darwin-bundle.sh    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
index 971b3fb92f9c..b2e2738cb6ec 100644
--- a/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
+++ b/pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
@@ -40,10 +40,10 @@ convertIconTheme() {
 
         local -a validSizes=(
             ${exactSize}
-            $(expr $iconSize + 1)x$(expr $iconSize + 1)${scaleSuffix}
-            $(expr $iconSize + 2)x$(expr $iconSize + 2)${scaleSuffix}
-            $(expr $iconSize - 1)x$(expr $iconSize - 1)${scaleSuffix}
-            $(expr $iconSize - 2)x$(expr $iconSize - 2)${scaleSuffix}
+            $((iconSize + 1))x$((iconSize + 1))${scaleSuffix}
+            $((iconSize + 2))x$((iconSize + 2))${scaleSuffix}
+            $((iconSize - 1))x$((iconSize - 1))${scaleSuffix}
+            $((iconSize - 2))x$((iconSize - 2))${scaleSuffix}
         )
 
         for iconIndex in "${!candidateIcons[@]}"; do
@@ -68,8 +68,8 @@ convertIconTheme() {
         local -r iconSize=$3
         local -r scale=$4
 
-        local density=$(expr 72 \* $scale)x$(expr 72 \* $scale)
-        local dim=$(expr $iconSize \* $scale)
+        local density=$((72 * scale))x$((72 * scale))
+        local dim=$((iconSize * scale))
 
         magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"
     }
@@ -81,8 +81,8 @@ convertIconTheme() {
         local -r scale=$4
 
         if [[ $in != '-' ]]; then
-            local density=$(expr 72 \* $scale)x$(expr 72 \* $scale)
-            local dim=$(expr $iconSize \* $scale)
+            local density=$((72 * scale))x$((72 * scale))
+            local dim=$((iconSize * scale))
             rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"
             magick convert -density "$density" -units PixelsPerInch "$out" "$out"
         else
@@ -115,7 +115,7 @@ convertIconTheme() {
                 local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png
                 case $type in
                     fixed)
-                        local density=$(expr 72 \* $scale)x$(expr 72 \* $scale)
+                        local density=$((72 * scale))x$((72 * scale))
                         magick convert -density "$density" -units PixelsPerInch "$icon" "$result"
                         ;;
                     threshold)