BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

desktopToDarwinBundle: use Bash arithmetic

Browse source 
Co-authored-by: Uri Baghin <uri@canva.com>
This commit is contained in:
Randy Eckenrode 2022-03-01 22:00:13 -05:00
parent d2748e84f8
commit 8a2fdda938
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
pkgs/build-support/setup-hooks/desktop-to-darwin-bundle.sh
View file

@ -40,10 +40,10 @@ convertIconTheme() {
local -a validSizes=( local -a validSizes=(
${exactSize} ${exactSize}
$(expr $iconSize + 1)x$(expr $iconSize + 1)${scaleSuffix} $((iconSize + 1))x$((iconSize + 1))${scaleSuffix}
$(expr $iconSize + 2)x$(expr $iconSize + 2)${scaleSuffix} $((iconSize + 2))x$((iconSize + 2))${scaleSuffix}
$(expr $iconSize - 1)x$(expr $iconSize - 1)${scaleSuffix} $((iconSize - 1))x$((iconSize - 1))${scaleSuffix}
$(expr $iconSize - 2)x$(expr $iconSize - 2)${scaleSuffix} $((iconSize - 2))x$((iconSize - 2))${scaleSuffix}
) )
for iconIndex in "${!candidateIcons[@]}"; do for iconIndex in "${!candidateIcons[@]}"; do
@ -68,8 +68,8 @@ convertIconTheme() {
local -r iconSize=$3 local -r iconSize=$3
local -r scale=$4 local -r scale=$4
local density=$(expr 72 \* $scale)x$(expr 72 \* $scale) local density=$((72 * scale))x$((72 * scale))
local dim=$(expr $iconSize \* $scale) local dim=$((iconSize * scale))
magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out" magick convert -scale "${dim}x${dim}" -density "$density" -units PixelsPerInch "$in" "$out"
} }
@ -81,8 +81,8 @@ convertIconTheme() {
local -r scale=$4 local -r scale=$4
if [[ $in != '-' ]]; then if [[ $in != '-' ]]; then
local density=$(expr 72 \* $scale)x$(expr 72 \* $scale) local density=$((72 * scale))x$((72 * scale))
local dim=$(expr $iconSize \* $scale) local dim=$((iconSize * scale))
rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out" rsvg-convert --keep-aspect-ratio --width "$dim" --height "$dim" "$in" --output "$out"
magick convert -density "$density" -units PixelsPerInch "$out" "$out" magick convert -density "$density" -units PixelsPerInch "$out" "$out"
else else
@ -115,7 +115,7 @@ convertIconTheme() {
local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png local result=${resultdir}/${iconSize}x${iconSize}${scales[$scale]}${scaleSuffix:+x}.png
case $type in case $type in
fixed) 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" magick convert -density "$density" -units PixelsPerInch "$icon" "$result"
;; ;;
threshold) threshold)