diff options
author | Randy Eckenrode <randy@largeandhighquality.com> | 2022-03-01 22:00:13 -0500 |
---|---|---|
committer | Randy Eckenrode <randy@largeandhighquality.com> | 2022-03-01 22:00:13 -0500 |
commit | 8a2fdda9381c7651a3b2352745849c7a2ac15eda (patch) | |
tree | 0b10424fb4fac5cb685a7e4c46be92ab1d0bcd8a /pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | |
parent | d2748e84f825731c513e244e9df3cd155351290e (diff) | |
download | nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar.gz nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar.bz2 nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar.lz nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar.xz nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.tar.zst nixpkgs-8a2fdda9381c7651a3b2352745849c7a2ac15eda.zip |
desktopToDarwinBundle: use Bash arithmetic
Co-authored-by: Uri Baghin <uri@canva.com>
Diffstat (limited to 'pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh')
-rw-r--r-- | pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh | 18 |
1 files 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 971b3fb92f9..b2e2738cb6e 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) |