diff options
| author | Robby Russell <robby@planetargon.com> | 2015-08-30 21:38:09 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-08-30 21:38:09 -0700 |
| commit | 9c9699dcf561b4ba39605e1706065bc7f810ef74 (patch) | |
| tree | 0b304b247d248c97f1a31439d502d04bbe3e2c51 /plugins/emoji | |
| parent | 6346cc9ba939f1ab0804b6f7e35277fbada775c5 (diff) | |
| parent | be667a24b0dc6a42a3e5368727366449b09633d1 (diff) | |
| download | zsh-9c9699dcf561b4ba39605e1706065bc7f810ef74.tar.gz zsh-9c9699dcf561b4ba39605e1706065bc7f810ef74.tar.bz2 zsh-9c9699dcf561b4ba39605e1706065bc7f810ef74.zip | |
Merge pull request #4250 from mcornella/fix-divide-by-zero-emoji
Fix divide by zero in emoji plugin
Diffstat (limited to 'plugins/emoji')
| -rw-r--r-- | plugins/emoji/emoji.plugin.zsh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh index a98d0b714..7876f1c89 100644 --- a/plugins/emoji/emoji.plugin.zsh +++ b/plugins/emoji/emoji.plugin.zsh @@ -76,8 +76,6 @@ emoji_skintone[6]=$'\U1F3FF' # These are stored in a single associative array, $emoji_groups, to avoid cluttering up the global # namespace, and to allow adding additional group definitions at run time. # The keys are the group names, and the values are whitespace-separated lists of emoji character names. -# -# These extra local arrays are used to allow more convenient formatting of the source code. emoji_groups[fruits]=" tomato @@ -255,9 +253,10 @@ function random_emoji() { if [[ -z "$group" || "$group" == "all" ]]; then names=(${(k)emoji}) else - names=(${=emoji_groups[$group_name]}) + names=(${=emoji_groups[$group]}) fi - local list_size=$#names + local list_size=${#names} + [[ $list_size -eq 0 ]] && return 1 local random_index=$(( ( RANDOM % $list_size ) + 1 )) local name=${names[$random_index]} echo ${emoji[$name]} |