diff --git a/i3lock-fancy b/i3lock-fancy index d35b977..0605b46 100755 --- a/i3lock-fancy +++ b/i3lock-fancy @@ -6,7 +6,7 @@ set -o errexit -o noclobber -o nounset hue=(-level "0%,100%,0.6") effect=(-filter Gaussian -resize 20% -define "filter:sigma=1.5" -resize 500.5%) # default system sans-serif font -font=$(convert -list font | awk "{ a[NR] = \$2 } /family: $(fc-match sans -f "%{family}\n")/ { print a[NR-1]; exit }") +font=$(magick -list font | awk "{ a[NR] = \$2 } /family: $(fc-match sans -f "%{family}\n")/ { print a[NR-1]; exit }") image=$(mktemp --suffix=.png) shot=(import -silent -window root) desktop="" @@ -37,7 +37,7 @@ options="Options: or 'maim' will increase script speed and allow setting custom flags like having a delay." -# move pipefail down as for some reason "convert -list font" returns 1 +# move pipefail down as for some reason "magick -list font" returns 1 set -o pipefail trap 'rm -f "$image"' EXIT temp="$(getopt -o :hdnpglt:f: -l desktop,help,listfonts,nofork,pixelate,greyscale,text:,font: --name "$0" -- "$@")" @@ -82,7 +82,7 @@ while true ; do esac ;; -t|--text) text=$2 ; shift 2 ;; -l|--listfonts) - convert -list font | awk -F: '/Font: / { print $2 }' | sort -du | command -- ${PAGER:-less} + magick -list font | awk -F: '/Font: / { print $2 }' | sort -du | command -- ${PAGER:-less} exit 0 ;; -n|--nofork) i3lock_cmd+=(--nofork) ; shift ;; --) shift; shot_custom=true; break ;; @@ -98,7 +98,7 @@ command -- "${shot[@]}" "$image" value="60" #brightness value to compare to -color=$(convert "$image" -gravity center -crop 100x100+0+0 +repage -colorspace hsb \ +color=$(magick "$image" -gravity center -crop 100x100+0+0 +repage -colorspace hsb \ -resize 1x1 txt:- | awk -F '[%$]' 'NR==2{gsub(",",""); printf "%.0f\n", $(NF-1)}'); if [[ $color -gt $value ]]; then #white background image and black text @@ -121,7 +121,7 @@ else #black "--date-color=00000000" "--layout-color=00000000") fi -convert "$image" "${hue[@]}" "${effect[@]}" -font "$font" -pointsize 26 -fill "$bw" -gravity center \ +magick "$image" "${hue[@]}" "${effect[@]}" -font "$font" -pointsize 26 -fill "$bw" -gravity center \ -annotate +0+160 "$text" "$icon" -gravity center -composite "$image" # If invoked with -d/--desktop, we'll attempt to minimize all windows (ie. show