diff options
126 files changed, 6795 insertions, 1560 deletions
diff --git a/README.markdown b/README.markdown index 9f96e315d..a29df81ab 100644 --- a/README.markdown +++ b/README.markdown @@ -3,9 +3,9 @@ Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration. That sounds boring. Let's try this again. -__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interface with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often. +__Oh My Zsh is a way of life!__ Once installed, your terminal prompt will become the talk of the town _or your money back!_ Each time you interact with your command prompt, you'll be able take advantage of the hundreds of bundled plugins and pretty themes. Strangers will come up to you in cafés and ask you, _"that is amazing. are you some sort of genius?"_ Finally, you'll begin to get the sort of attention that you always felt that you deserved. ...or maybe you'll just use the time that you saved to start flossing more often. -To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on twitter. +To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. ## Getting Started @@ -15,9 +15,9 @@ To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com __Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._ * Unix-based operating system (Mac OS X or Linux) -* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent) - * This is commonly pre-installed. (`zsh --version` to confirm) +* [Zsh](http://www.zsh.org) should be installed (v4.3.9 or more recent). If not pre-installed (`zsh --version` to confirm), check the following instruction here: [Installing-ZSH](https://github.com/robbyrussell/oh-my-zsh/wiki/Installing-ZSH) * `curl` or `wget` should be installed +* `git` should be installed ### Basic Installation @@ -25,11 +25,11 @@ Oh My Zsh is installed by running one of the following commands in your terminal #### via curl -`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | sh` +`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"` #### via wget -`wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O - | sh` +`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"` ## Using Oh My Zsh @@ -43,7 +43,9 @@ If you spot a plugin (or several) that you would like to use with Oh My Zsh, you For example, this line might begin to look like... -`plugins=(git bundler osx rake ruby)` +```shell +plugins=(git bundler osx rake ruby) +``` #### Using Plugins @@ -51,7 +53,7 @@ Most plugins (should! we're working on this) include a __README__, which documen ### Themes -We'll admit it. Early in the Oh My Zsh world... we may have gotten a far too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out! +We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred themes now bundled. Most of them have [screenshots](https://wiki.github.com/robbyrussell/oh-my-zsh/themes) on the wiki. Check them out! #### Selecting a Theme @@ -59,21 +61,37 @@ _Robby's theme is the default one. It's not the fanciest one. It's not the simpl Once you find a theme that you want to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like: -`ZSH_THEME="robbyrussell"` +```shell +ZSH_THEME="robbyrussell" +``` -To use a different theme, simple change the value to match the name of your desired theme. For example: +To use a different theme, simply change the value to match the name of your desired theme. For example: -`ZSH_THEME="agnoster"` (this is one of the fancy ones) +```shell +ZSH_THEME="agnoster" # (this is one of the fancy ones) +``` Open up a new terminal window and your prompt should look something like... + + +In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes). + +If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window. + + +```shell +ZSH_THEME="random" # (...please let it be pie... please be some pie..) +``` + + ## Advanced Topics -If you're the type that likes to get their hands dirty... these sections might resonate. +If you're the type that likes to get their hands dirty, these sections might resonate. ### Advanced Installation -For those who want to install this manually and/or set custom paths. +Some users may want to change the default path, or manually install Oh My Zsh. #### Custom Directory @@ -81,27 +99,37 @@ The default location is `~/.oh-my-zsh` (hidden in your home directory) If you'd like to change the install directory with the `ZSH` environment variable, either by running `export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this: -`curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh` +```shell +curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh +``` #### Manual Installation ##### 1. Clone the repository: -`git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh` +```shell +git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh +``` -##### 2. *Optionally*, backup your existing @~/.zshrc@ file: +##### 2. *Optionally*, backup your existing `~/.zshrc` file: -`cp ~/.zshrc ~/.zshrc.orig` +```shell +cp ~/.zshrc ~/.zshrc.orig +``` ##### 3. Create a new zsh configuration file You can create a new zsh config file by copying the template that we included for you. -`cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc` +```shell +cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc +``` ##### 4. Change your default shell -`chsh -s /bin/zsh` +```shell +chsh -s /bin/zsh +``` ##### 5. Initialize your new zsh configuration @@ -118,7 +146,7 @@ If you have any hiccups installing, here are a few common fixes. If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory. -If you have many functions that go well together, you can put them as a `abcyzeae.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin. +If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin. If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`. @@ -126,17 +154,23 @@ If you would like to override the functionality of a plugin distributed with Oh By default, you will be prompted to check for upgrades every few weeks. If you would like `oh-my-zsh` to automatically upgrade itself without prompting you, set the following in your `~/.zshrc`: -`DISABLE_UPDATE_PROMPT=true` +```shell +DISABLE_UPDATE_PROMPT=true +``` To disable automatic upgrades, set the following in your `~/.zshrc`: -`DISABLE_AUTO_UPDATE=true` +```shell +DISABLE_AUTO_UPDATE=true +``` ### Manual Updates -If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?)... you just need to run: +If you'd like to upgrade at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run: -`upgrade_oh_my_zsh` +```shell +upgrade_oh_my_zsh +``` Magic! @@ -152,9 +186,9 @@ I'm far from being a [Zsh](http://www.zsh.org/) expert and suspect there are man We also need people to test out pull-requests. So take a look through [the open issues](https://github.com/robbyrussell/oh-my-zsh/issues) and help where you can. -### Do NOT Send Us Themes +### Do NOT send us themes -We have (more than) enough themes for the time being. Please fork the project and add one in there – you can let people know how to grab it from there. +We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/robbyrussell/oh-my-zsh/wiki/External-themes) wiki page. ## Contributors @@ -164,12 +198,12 @@ Thank you so much! ## Follow Us -We have an [ohmyzsh](https://twitter.com/ohmyzsh) account. You should follow it. +We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it. ## Merchandise We have [stickers](http://shop.planetargon.com/products/ohmyzsh-stickers-set-of-3-stickers) and [shirts](http://shop.planetargon.com/products/ohmyzsh-t-shirts) for you to show off your love of Oh My Zsh. Again, this will help you become the talk of the town! -## LICENSE +## License Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt). diff --git a/lib/compfix.zsh b/lib/compfix.zsh new file mode 100644 index 000000000..208aaadb1 --- /dev/null +++ b/lib/compfix.zsh @@ -0,0 +1,60 @@ +# Handle completions insecurities (i.e., completion-dependent directories with +# insecure ownership or permissions) by: +# +# * Human-readably notifying the user of these insecurities. +# * Moving away all existing completion caches to a temporary directory. Since +# any of these caches may have been generated from insecure directories, they +# are all suspect now. Failing to do so typically causes subsequent compinit() +# calls to fail with "command not found: compdef" errors. (That's bad.) +function handle_completion_insecurities() { + # List of the absolute paths of all unique insecure directories, split on + # newline from compaudit()'s output resembling: + # + # There are insecure directories: + # /usr/share/zsh/site-functions + # /usr/share/zsh/5.0.6/functions + # /usr/share/zsh + # /usr/share/zsh/5.0.6 + # + # Since the ignorable first line is printed to stderr and thus not captured, + # stderr is squelched to prevent this output from leaking to the user. + local -aU insecure_dirs + insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} ) + + # If no such directories exist, get us out of here. + if (( ! ${#insecure_dirs} )); then + print "[oh-my-zsh] No insecure completion-dependent directories detected." + return + fi + + # List ownership and permissions of all insecure directories. + print "[oh-my-zsh] Insecure completion-dependent directories detected:" + ls -ld "${(@)insecure_dirs}" + print "[oh-my-zsh] For safety, completions will be disabled until you manually fix all" + print "[oh-my-zsh] insecure directory permissions and ownership and restart oh-my-zsh." + print "[oh-my-zsh] See the above list for directories with group or other writability.\n" + + # Locally enable the "NULL_GLOB" option, thus removing unmatched filename + # globs from argument lists *AND* printing no warning when doing so. Failing + # to do so prints an unreadable warning if no completion caches exist below. + setopt local_options null_glob + + # List of the absolute paths of all unique existing completion caches. + local -aU zcompdump_files + zcompdump_files=( "${ZSH_COMPDUMP}"(.) "${ZDOTDIR:-${HOME}}"/.zcompdump* ) + + # Move such caches to a temporary directory. + if (( ${#zcompdump_files} )); then + # Absolute path of the directory to which such files will be moved. + local ZSH_ZCOMPDUMP_BAD_DIR="${ZSH_CACHE_DIR}/zcompdump-bad" + + # List such files first. + print "[oh-my-zsh] Insecure completion caches also detected:" + ls -l "${(@)zcompdump_files}" + + # For safety, move rather than permanently remove such files. + print "[oh-my-zsh] Moving to \"${ZSH_ZCOMPDUMP_BAD_DIR}/\"...\n" + mkdir -p "${ZSH_ZCOMPDUMP_BAD_DIR}" + mv "${(@)zcompdump_files}" "${ZSH_ZCOMPDUMP_BAD_DIR}/" + fi +} diff --git a/lib/completion.zsh b/lib/completion.zsh index 4b1bb0a62..452c0dfe7 100644 --- a/lib/completion.zsh +++ b/lib/completion.zsh @@ -15,7 +15,12 @@ if [ "x$CASE_SENSITIVE" = "xtrue" ]; then zstyle ':completion:*' matcher-list 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' unset CASE_SENSITIVE else - zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + if [ "x$HYPHEN_INSENSITIVE" = "xtrue" ]; then + zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + unset HYPHEN_INSENSITIVE + else + zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' + fi fi zstyle ':completion:*' list-colors '' diff --git a/lib/functions.zsh b/lib/functions.zsh index 17f5f9cbf..efb73a1bd 100644 --- a/lib/functions.zsh +++ b/lib/functions.zsh @@ -15,6 +15,22 @@ function take() { cd $1 } +function open_command() { + local open_cmd + + # define the open command + case "$OSTYPE" in + darwin*) open_cmd="open" ;; + cygwin*) open_cmd="cygstart" ;; + linux*) open_cmd="xdg-open" ;; + *) echo "Platform $OSTYPE not supported" + return 1 + ;; + esac + + nohup $open_cmd "$@" &>/dev/null +} + # # Get the value of an alias. # @@ -73,3 +89,135 @@ function env_default() { env | grep -q "^$1=" && return 0 export "$1=$2" && return 3 } + + +# Required for $langinfo +zmodload zsh/langinfo + +# URL-encode a string +# +# Encodes a string using RFC 2396 URL-encoding (%-escaped). +# See: https://www.ietf.org/rfc/rfc2396.txt +# +# By default, reserved characters and unreserved "mark" characters are +# not escaped by this function. This allows the common usage of passing +# an entire URL in, and encoding just special characters in it, with +# the expectation that reserved and mark characters are used appropriately. +# The -r and -m options turn on escaping of the reserved and mark characters, +# respectively, which allows arbitrary strings to be fully escaped for +# embedding inside URLs, where reserved characters might be misinterpreted. +# +# Prints the encoded string on stdout. +# Returns nonzero if encoding failed. +# +# Usage: +# omz_urlencode [-r] [-m] <string> +# +# -r causes reserved characters (;/?:@&=+$,) to be escaped +# +# -m causes "mark" characters (_.!~*''()-) to be escaped +# +# -P causes spaces to be encoded as '%20' instead of '+' +function omz_urlencode() { + emulate -L zsh + zparseopts -D -E -a opts r m P + + local in_str=$1 + local url_str="" + local spaces_as_plus + if [[ -z $opts[(r)-P] ]]; then spaces_as_plus=1; fi + local str="$in_str" + + # URLs must use UTF-8 encoding; convert str to UTF-8 if required + local encoding=$langinfo[CODESET] + local safe_encodings + safe_encodings=(UTF-8 utf8 US-ASCII) + if [[ -z ${safe_encodings[(r)$encoding]} ]]; then + str=$(echo -E "$str" | iconv -f $encoding -t UTF-8) + if [[ $? != 0 ]]; then + echo "Error converting string from $encoding to UTF-8" >&2 + return 1 + fi + fi + + # Use LC_CTYPE=C to process text byte-by-byte + local i byte ord LC_ALL=C + export LC_ALL + local reserved=';/?:@&=+$,' + local mark='_.!~*''()-' + local dont_escape="[A-Za-z0-9" + if [[ -z $opts[(r)-r] ]]; then + dont_escape+=$reserved + fi + # $mark must be last because of the "-" + if [[ -z $opts[(r)-m] ]]; then + dont_escape+=$mark + fi + dont_escape+="]" + + # Implemented to use a single printf call and avoid subshells in the loop, + # for performance (primarily on Windows). + local url_str="" + for (( i = 1; i <= ${#str}; ++i )); do + byte="$str[i]" + if [[ "$byte" =~ "$dont_escape" ]]; then + url_str+="$byte" + else + if [[ "$byte" == " " && -n $spaces_as_plus ]]; then + url_str+="+" + else + ord=$(( [##16] #byte )) + url_str+="%$ord" + fi + fi + done + echo -E "$url_str" +} + +# URL-decode a string +# +# Decodes a RFC 2396 URL-encoded (%-escaped) string. +# This decodes the '+' and '%' escapes in the input string, and leaves +# other characters unchanged. Does not enforce that the input is a +# valid URL-encoded string. This is a convenience to allow callers to +# pass in a full URL or similar strings and decode them for human +# presentation. +# +# Outputs the encoded string on stdout. +# Returns nonzero if encoding failed. +# +# Usage: +# omz_urldecode <urlstring> - prints decoded string followed by a newline +function omz_urldecode { + emulate -L zsh + local encoded_url=$1 + + # Work bytewise, since URLs escape UTF-8 octets + local caller_encoding=$langinfo[CODESET] + local LC_ALL=C + export LC_ALL + + # Change + back to ' ' + local tmp=${encoded_url:gs/+/ /} + # Protect other escapes to pass through the printf unchanged + tmp=${tmp:gs/\\/\\\\/} + # Handle %-escapes by turning them into `\xXX` printf escapes + tmp=${tmp:gs/%/\\x/} + local decoded + eval "decoded=\$'$tmp'" + + # Now we have a UTF-8 encoded string in the variable. We need to re-encode + # it if caller is in a non-UTF-8 locale. + local safe_encodings + safe_encodings=(UTF-8 utf8 US-ASCII) + if [[ -z ${safe_encodings[(r)$caller_encoding]} ]]; then + decoded=$(echo -E "$decoded" | iconv -f UTF-8 -t $caller_encoding) + if [[ $? != 0 ]]; then + echo "Error converting string from UTF-8 to $caller_encoding" >&2 + return 1 + fi + fi + + echo -E "$decoded" +} + diff --git a/lib/git.zsh b/lib/git.zsh index 118841f06..baf863717 100644 --- a/lib/git.zsh +++ b/lib/git.zsh @@ -36,24 +36,30 @@ git_remote_status() { ahead=$(command git rev-list ${hook_com[branch]}@{upstream}..HEAD 2>/dev/null | wc -l) behind=$(command git rev-list HEAD..${hook_com[branch]}@{upstream} 2>/dev/null | wc -l) - if [ $ahead -eq 0 ] && [ $behind -gt 0 ] + if [ $ahead -eq 0 ] && [ $behind -eq 0 ] then - echo "$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE" + echo "$ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE" elif [ $ahead -gt 0 ] && [ $behind -eq 0 ] then - echo "$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" + git_remote_status="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE" + git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}" + elif [ $behind -gt 0 ] && [ $ahead -eq 0 ] + then + git_remote_status="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE" + git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" elif [ $ahead -gt 0 ] && [ $behind -gt 0 ] then - echo "$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE" + git_remote_status="$ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE" + git_remote_status_detailed="$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE$((ahead))%{$reset_color%}$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR$ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE$((behind))%{$reset_color%}" fi - fi -} -# Checks if there are commits ahead from remote -function git_prompt_ahead() { - if $(echo "$(command git log @{upstream}..HEAD 2> /dev/null)" | grep '^commit' &> /dev/null); then - echo "$ZSH_THEME_GIT_PROMPT_AHEAD" - fi + if [ $ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED ] + then + git_remote_status="$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX$remote$git_remote_status_detailed$ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX" + fi + + echo $git_remote_status + fi } # Gets the number of commits ahead from remote @@ -64,6 +70,29 @@ function git_commits_ahead() { fi } +# Outputs if current branch is ahead of remote +function git_prompt_ahead() { + if [[ -n "$(command git rev-list origin/$(current_branch)..HEAD 2> /dev/null)" ]]; then + echo "$ZSH_THEME_GIT_PROMPT_AHEAD" + fi +} + +# Outputs if current branch is behind remote +function git_prompt_behind() { + if [[ -n "$(command git rev-list HEAD..origin/$(current_branch) 2> /dev/null)" ]]; then + echo "$ZSH_THEME_GIT_PROMPT_BEHIND" + fi +} + +# Outputs if current branch exists on remote or not +function git_prompt_remote() { + if [[ -n "$(command git show-ref origin/$(current_branch) 2> /dev/null)" ]]; then + echo "$ZSH_THEME_GIT_PROMPT_REMOTE_EXISTS" + else + echo "$ZSH_THEME_GIT_PROMPT_REMOTE_MISSING" + fi +} + # Formats prompt string for current git commit short SHA function git_prompt_short_sha() { SHA=$(command git rev-parse --short HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER" diff --git a/lib/misc.zsh b/lib/misc.zsh index 0b7cb2696..6d1a64e8d 100644 --- a/lib/misc.zsh +++ b/lib/misc.zsh @@ -1,6 +1,10 @@ -## smart urls -autoload -U url-quote-magic -zle -N self-insert url-quote-magic +## Load smart urls if available +for d in $fpath; do + if [[ -e "$d/url-quote-magic" ]]; then + autoload -U url-quote-magic + zle -N self-insert url-quote-magic + fi +done ## jobs setopt long_list_jobs @@ -20,3 +24,6 @@ alias afind='ack-grep -il' if [[ -z "$LC_CTYPE" && -z "$LC_ALL" ]]; then export LC_CTYPE=${LANG%%:*} # pick the first entry from LANG fi + +# recognize comments +setopt interactivecomments diff --git a/lib/termsupport.zsh b/lib/termsupport.zsh index e1c2e2f93..5f61fe8ef 100644 --- a/lib/termsupport.zsh +++ b/lib/termsupport.zsh @@ -7,6 +7,9 @@ # (In screen, only short_tab_title is used) # Limited support for Apple Terminal (Terminal can't set window and tab separately) function title { + emulate -L zsh + setopt prompt_subst + [[ "$EMACS" == *term* ]] && return # if $2 is unset use $1 as default @@ -23,9 +26,14 @@ function title { ZSH_THEME_TERM_TAB_TITLE_IDLE="%15<..<%~%<<" #15 char left truncated PWD ZSH_THEME_TERM_TITLE_IDLE="%n@%m: %~" +# Avoid duplication of directory in terminals with independent dir display +if [[ $TERM_PROGRAM == Apple_Terminal ]]; then + ZSH_THEME_TERM_TITLE_IDLE="%n@%m" +fi # Runs before showing the prompt function omz_termsupport_precmd { + emulate -L zsh if [[ $DISABLE_AUTO_TITLE == true ]]; then return fi @@ -35,15 +43,15 @@ function omz_termsupport_precmd { # Runs before executing the command function omz_termsupport_preexec { + emulate -L zsh if [[ $DISABLE_AUTO_TITLE == true ]]; then return fi - emulate -L zsh setopt extended_glob # cmd name only, or if this is sudo or ssh, the next cmd - local CMD=${1[(wr)^(*=*|sudo|ssh|rake|-*)]:gs/%/%%} + local CMD=${1[(wr)^(*=*|sudo|ssh|mosh|rake|-*)]:gs/%/%%} local LINE="${2:gs/%/%%}" title '$CMD' '%100>...>$LINE%<<' @@ -53,14 +61,28 @@ precmd_functions+=(omz_termsupport_precmd) preexec_functions+=(omz_termsupport_preexec) -# Runs before showing the prompt, to update the current directory in Terminal.app -function omz_termsupport_cwd { - # Notify Terminal.app of current directory using undocumented OSC sequence - # found in OS X 10.9 and 10.10's /etc/bashrc - if [[ $TERM_PROGRAM == Apple_Terminal ]] && [[ -z $INSIDE_EMACS ]]; then - local PWD_URL="file://$HOSTNAME${PWD// /%20}" - printf '\e]7;%s\a' "$PWD_URL" - fi -} +# Keep Apple Terminal.app's current working directory updated +# Based on this answer: http://superuser.com/a/315029 +# With extra fixes to handle multibyte chars and non-UTF-8 locales + +if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then + + # Emits the control sequence to notify Terminal.app of the cwd + function update_terminalapp_cwd() { + emulate -L zsh + # Identify the directory using a "file:" scheme URL, including + # the host name to disambiguate local vs. remote paths. + + # Percent-encode the pathname. + local URL_PATH=$(omz_urlencode -P $PWD) + [[ $? != 0 ]] && return 1 + local PWD_URL="file://$HOST$URL_PATH" + # Undocumented Terminal.app-specific control sequence + printf '\e]7;%s\a' $PWD_URL + } -precmd_functions+=(omz_termsupport_cwd) + # Use a precmd hook instead of a chpwd hook to avoid contaminating output + precmd_functions+=(update_terminalapp_cwd) + # Run once to get initial cwd set + update_terminalapp_cwd +fi diff --git a/lib/theme-and-appearance.zsh b/lib/theme-and-appearance.zsh index 926303ca4..ebb11fb31 100644 --- a/lib/theme-and-appearance.zsh +++ b/lib/theme-and-appearance.zsh @@ -11,8 +11,11 @@ then # otherwise, leave ls as is, because NetBSD's ls doesn't support -G gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' elif [[ "$(uname -s)" == "OpenBSD" ]]; then - # On OpenBSD, test if "colorls" is installed (this one supports colors); - # otherwise, leave ls as is, because OpenBSD's ls doesn't support -G + # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base, + # with color and multibyte support) are available from ports. "colorls" + # will be installed on purpose and can't be pulled in by installing + # coreutils, so prefer it to "gls". + gls --color -d . &>/dev/null 2>&1 && alias ls='gls --color=tty' colorls -G -d . &>/dev/null 2>&1 && alias ls='colorls -G' else ls --color -d . &>/dev/null 2>&1 && alias ls='ls --color=tty' || alias ls='ls -G' diff --git a/oh-my-zsh.sh b/oh-my-zsh.sh index bc7a8e496..8e31ddd0f 100644 --- a/oh-my-zsh.sh +++ b/oh-my-zsh.sh @@ -8,13 +8,16 @@ fi # add a function path fpath=($ZSH/functions $ZSH/completions $fpath) +# Load all stock functions (from $fpath files) called below. +autoload -U compaudit compinit + # Set ZSH_CUSTOM to the path where your custom config files # and plugins exists, or else we will use the default custom/ if [[ -z "$ZSH_CUSTOM" ]]; then ZSH_CUSTOM="$ZSH/custom" fi -# Set ZSH_CACHE_DIR to the path where cache files sould be created +# Set ZSH_CACHE_DIR to the path where cache files should be created # or else we will use the default cache/ if [[ -z "$ZSH_CACHE_DIR" ]]; then ZSH_CACHE_DIR="$ZSH/cache/" @@ -59,9 +62,14 @@ if [ -z "$ZSH_COMPDUMP" ]; then ZSH_COMPDUMP="${ZDOTDIR:-${HOME}}/.zcompdump-${SHORT_HOST}-${ZSH_VERSION}" fi -# Load and run compinit -autoload -U compinit -compinit -i -d "${ZSH_COMPDUMP}" +# If completion insecurities exist, warn the user without enabling completions. +if ! compaudit &>/dev/null; then + # This function resides in the "lib/compfix.zsh" script sourced above. + handle_completion_insecurities +# Else, enable and cache completions to the desired file. +else + compinit -d "${ZSH_COMPDUMP}" +fi # Load all of the plugins that were defined in ~/.zshrc for plugin ($plugins); do diff --git a/plugins/adb/_adb b/plugins/adb/_adb index 22089581a..f30f3247f 100644 --- a/plugins/adb/_adb +++ b/plugins/adb/_adb @@ -16,14 +16,22 @@ _1st_arguments=( 'help:show the help message' 'install:push this package file to the device and install it' 'jdwp:list PIDs of processes hosting a JDWP transport' -'logcat:View device log' +'kill-server:kill the server if it is running' +'logcat:view device log' 'pull:copy file/dir from device' 'push:copy file/dir to device' +'reboot:reboots the device, optionally into the bootloader or recovery program' +'reboot-bootloader:reboots the device into the bootloader' +'remount:remounts the partitions on the device read-write' +'root:restarts the adbd daemon with root permissions' +'sideload:push a ZIP to device and install it' 'shell:run remote shell interactively' 'sync:copy host->device only if changed (-l means list but dont copy)' -‘tcpip:restart host adb in tcpip mode’ +'start-server:ensure that there is a server running' +'tcpip:restart host adb in tcpip mode' 'uninstall:remove this app package from the device' 'version:show version num' +'wait-for-device:block until device is online' ) local expl diff --git a/plugins/apache2-macports/README.md b/plugins/apache2-macports/README.md new file mode 100644 index 000000000..099fc8da3 --- /dev/null +++ b/plugins/apache2-macports/README.md @@ -0,0 +1,19 @@ +## APACHE2 MACPORTS PLUGIN + + +--- + +### FEATURES + +| Alias | Function | Description | +|:--------------:|:-------------------------------------------------------------------------------|----------------------:| +| apache2restart | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper restart | Restart apache daemon | +| apache2start | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper start | Start apache daemon | +| apache2stop | sudo /opt/local/etc/LaunchDaemons/org.macports.apache2/apache2.wrapper stop | Stop apache daemon | + +--- + +### CONTRIBUTORS + - Alexander Rinass (alex@rinass.net) + +--- diff --git a/plugins/archlinux/README.md b/plugins/archlinux/README.md new file mode 100644 index 000000000..ad42d4cd2 --- /dev/null +++ b/plugins/archlinux/README.md @@ -0,0 +1,64 @@ +## ARCHLINUX PLUGIN + + +--- + +### FEATURES + +| Alias | Function | Description | +|:------------:|-----------------------------------------|:--------------------------------------------------------------------------------------------------------------------| +| pacin | sudo pacman -S | Install specific package(s) from the repositories | +| pacins | sudo pacman -U | Install specific package not from the repositories but from a file | +| pacinsd | sudo pacman -S --asdeps | Install given package(s) as dependencies of another package | +| pacloc | pacman -Qi | Display information about a given package in the local database | +| paclocs | pacman -Qs | Search for package(s) in the local database | +| paclsorphans | sudo pacman -Qdt' | List all orphaned packages | +| pacmir | sudo pacman -Syy | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist | +| pacre | sudo pacman -R | Remove the specified package(s), retaining its configuration(s) and required dependencies | +| pacrem | sudo pacman -Rns | Remove the specified package(s), its configuration(s) and unneeded dependencies | +| pacrep | pacman -Si | Display information about a given package in the repositories | +| pacreps | pacman -Ss | Search for package(s) in the repositories | +| pacrmorphans | sudo pacman -Rs $(pacman -Qtdq)' | Delete all orphaned packages | +| pacupd | sudo pacman -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases against repositories | +| pacupd | sudo pacman -Sy && sudo abs | Update and refresh the local package and ABS databases against repositories | +| pacupd | sudo pacman -Sy && sudo aur | Update and refresh the local package and AUR databases against repositories | +| pacupd | sudo pacman -Sy | Update and refresh the local package database against repositories | +| pacupg | sudo pacman -Syu | Synchronize with repositories before upgrading packages that are out of date on the local system. | +| yaconf | yaourt -C | Fix all configuration files with vimdiff | +| yain | yaourt -S | Install specific package(s) from the repositories | +| yains | yaourt -U | Install specific package not from the repositories but from a file | +| yainsd | yaourt -S --asdeps | Install given package(s) as dependencies of another package | +| yaloc | yaourt -Qi | Display information about a given package in the local database | +| yalocs | yaourt -Qs | Search for package(s) in the local database | +| yalst | yaourt -Qe | List installed packages, even those installed from AUR (they're tagged as "local") | +| yamir | yaourt -Syy | Force refresh of all package lists after updating /etc/pacman.d/mirrorlist | +| yaorph | yaourt -Qtd | Remove orphans using yaourt | +| yare | yaourt -R | Remove the specified package(s), retaining its configuration(s) and required dependencies | +| yarem | yaourt -Rns | Remove the specified package(s), its configuration(s) and unneeded dependencies | +| yarep | yaourt -Si | Display information about a given package in the repositories | +| yareps | yaourt -Ss | Search for package(s) in the repositories | +| yasu | yaourt --sucre | Same as yaupg, but without confirmation | +| yaupd | yaourt -Sy && sudo abs && sudo aur | Update and refresh the local package, ABS and AUR databases against repositories | +| yaupd | yaourt -Sy && sudo abs | Update and refresh the local package and ABS databases against repositories | +| yaupd | yaourt -Sy && sudo aur | Update and refresh the local package and AUR databases against repositories | +| yaupd | yaourt -Sy | Update and refresh the local package database against repositories | +| yaupg | yaourt -Syua | Synchronize with repositories before upgrading packages (AUR packages too) that are out of date on the local system | + +| Function | Description | +|----------------|:------------------------------------------------------------------------------------------------------------------| +| pacdisowned | List all disowned files in your system | +| paclist | List all installed packages with a short description - [Source](https://bbs.archlinux.org/viewtopic.php?id=93683) | +| pacmanallkeys | Get all keys for developers and trusted users | +| pacmansignkeys | | + +--- + +### CONTRIBUTORS + - Benjamin Boudreau - dreurmail@gmail.com + - Celso Miranda - contacto@celsomiranda.net + - KhasMek - Boushh@gmail.com + - Martin Putniorz - mputniorz@gmail.com + - MatthR3D - matthr3d@gmail.com + - ornicar - thibault.duplessis@gmail.com + +--- diff --git a/plugins/archlinux/archlinux.plugin.zsh b/plugins/archlinux/archlinux.plugin.zsh index 059884c27..b83c24560 100644 --- a/plugins/archlinux/archlinux.plugin.zsh +++ b/plugins/archlinux/archlinux.plugin.zsh @@ -2,7 +2,7 @@ # Usage is also described at https://github.com/robbyrussell/oh-my-zsh/wiki/Plugins # Look for yaourt, and add some useful functions if we have it. -if [[ -x `which yaourt` ]]; then +if [[ -x `command -v yaourt` ]]; then upgrade () { yaourt -Syu } @@ -21,11 +21,11 @@ if [[ -x `which yaourt` ]]; then alias yalst='yaourt -Qe' # List installed packages, even those installed from AUR (they're tagged as "local") alias yaorph='yaourt -Qtd' # Remove orphans using yaourt # Additional yaourt alias examples - if [[ -x `which abs` && -x `which aur` ]]; then + if [[ -x `command -v abs` && -x `command -v aur` ]]; then alias yaupd='yaourt -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories - elif [[ -x `which abs` ]]; then + elif [[ -x `command -v abs` ]]; then alias yaupd='yaourt -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories - elif [[ -x `which aur` ]]; then + elif [[ -x `command -v aur` ]]; then alias yaupd='yaourt -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories else alias yaupd='yaourt -Sy' # Update and refresh the local package database against repositories @@ -49,11 +49,11 @@ alias pacreps='pacman -Ss' # Search for package(s) in the repositori alias pacloc='pacman -Qi' # Display information about a given package in the local database alias paclocs='pacman -Qs' # Search for package(s) in the local database # Additional pacman alias examples -if [[ -x `which abs` && -x `which aur` ]]; then +if [[ -x `command -v abs` && -x `command -v aur` ]]; then alias pacupd='sudo pacman -Sy && sudo abs && sudo aur' # Update and refresh the local package, ABS and AUR databases against repositories -elif [[ -x `which abs` ]]; then +elif [[ -x `command -v abs` ]]; then alias pacupd='sudo pacman -Sy && sudo abs' # Update and refresh the local package and ABS databases against repositories -elif [[ -x `which aur` ]]; then +elif [[ -x `command -v aur` ]]; then alias pacupd='sudo pacman -Sy && sudo aur' # Update and refresh the local package and AUR databases against repositories else alias pacupd='sudo pacman -Sy' # Update and refresh the local package database against repositories @@ -63,7 +63,7 @@ alias pacmir='sudo pacman -Syy' # Force refresh of all package li # https://bbs.archlinux.org/viewtopic.php?id=93683 paclist() { - sudo pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}' + LC_ALL=C pacman -Qei $(pacman -Qu|cut -d" " -f 1)|awk ' BEGIN {FS=":"}/^Name/{printf("\033[1;36m%s\033[1;37m", $2)}/^Description/{print $2}' } alias paclsorphans='sudo pacman -Qdt' diff --git a/plugins/atom/README.md b/plugins/atom/README.md new file mode 100644 index 000000000..75d77a0ac --- /dev/null +++ b/plugins/atom/README.md @@ -0,0 +1,17 @@ +## atom + +Plugin for Atom, a cross platform text and code editor, available for Linux, Mac OS X, and Windows. + +### Requirements + + * [Atom](https://atom.io/) + +### Usage + + * If `at` command is called without an argument, launch Atom + + * If `at` is passed a directory, `cd` to it and open it in Atom + + * If `at` is passed a file, open it in Atom + + * if `att` command is called, it is equivalent to `at .`, opening the current folder in Atom diff --git a/plugins/autojump/autojump.plugin.zsh b/plugins/autojump/autojump.plugin.zsh index 4cf036401..c05c699e1 100644 --- a/plugins/autojump/autojump.plugin.zsh +++ b/plugins/autojump/autojump.plugin.zsh @@ -15,7 +15,7 @@ if [ $commands[autojump] ]; then # check if autojump is installed . /usr/local/share/autojump/autojump.zsh elif [ -f /opt/local/etc/profile.d/autojump.zsh ]; then # mac os x with ports . /opt/local/etc/profile.d/autojump.zsh - elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.zsh ]; then # mac os x with brew - . `brew --prefix`/etc/autojump.zsh + elif [ $commands[brew] -a -f `brew --prefix`/etc/autojump.sh ]; then # mac os x with brew + . `brew --prefix`/etc/autojump.sh fi fi diff --git a/plugins/aws/aws.plugin.zsh b/plugins/aws/aws.plugin.zsh index 0ae18dd56..7246db9f0 100644 --- a/plugins/aws/aws.plugin.zsh +++ b/plugins/aws/aws.plugin.zsh @@ -13,7 +13,8 @@ function agp { } function asp { export AWS_DEFAULT_PROFILE=$1 - export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>" + export AWS_PROFILE=$1 + export RPROMPT="<aws:$AWS_DEFAULT_PROFILE>$RPROMPT" } function aws_profiles { reply=($(grep profile $AWS_HOME/config|sed -e 's/.*profile \([a-zA-Z0-9_-]*\).*/\1/')) @@ -22,7 +23,7 @@ function aws_profiles { compctl -K aws_profiles asp if _homebrew-installed && _awscli-homebrew-installed ; then - _aws_zsh_completer_path=$(brew --prefix)/opt/awscli/libexec/bin/aws_zsh_completer.sh + _aws_zsh_completer_path=$(brew --prefix awscli)/libexec/bin/aws_zsh_completer.sh else _aws_zsh_completer_path=$(which aws_zsh_completer.sh) fi diff --git a/plugins/bgnotify/bgnotify.plugin.zsh b/plugins/bgnotify/bgnotify.plugin.zsh index 14ca4c817..b70b42f98 100755 --- a/plugins/bgnotify/bgnotify.plugin.zsh +++ b/plugins/bgnotify/bgnotify.plugin.zsh @@ -33,9 +33,9 @@ bgnotify () { if hash terminal-notifier 2>/dev/null; then #osx terminal-notifier -message "$2" -title "$1" elif hash growlnotify 2>/dev/null; then #osx growl - growlnotify -m $1 $2 + growlnotify -m "$1" "$2" elif hash notify-send 2>/dev/null; then #ubuntu! - notify-send $1 $2 + notify-send "$1" "$2" elif hash notifu 2>/dev/null; then #cygwyn support! notifu /m "$2" /p "$1" fi diff --git a/plugins/boot2docker/README.md b/plugins/boot2docker/README.md new file mode 100644 index 000000000..9551e2351 --- /dev/null +++ b/plugins/boot2docker/README.md @@ -0,0 +1,6 @@ +## Boot2docker autocomplete plugin + +- Adds autocomplete options for all boot2docker commands. + + +Maintainer : Manfred Touron ([@moul](https://github.com/moul)) diff --git a/plugins/boot2docker/_boot2docker b/plugins/boot2docker/_boot2docker new file mode 100644 index 000000000..3116bd14c --- /dev/null +++ b/plugins/boot2docker/_boot2docker @@ -0,0 +1,73 @@ +#compdef boot2docker + +# Boot2docker autocompletion for oh-my-zsh +# Requires: Boot2docker installed +# Author: Manfred Touron (@moul) + +local -a _1st_arguments +_1st_arguments=( + "init":"Create a new Boot2Docker VM." + "up":"Start VM from any states." + "start":"Start VM from any states." + "boot":"Start VM from any states." + "ssh":"[ssh-command] Login to VM via SSH." + "save":"Suspend VM and save state to disk." + "suspend":"Suspend VM and save state to disk." + "down":"Gracefully shutdown the VM." + "stop":"Gracefully shutdown the VM." + "halt":"Gracefully shutdown the VM." + "restart":"Gracefully reboot the VM." + "poweroff":"Forcefully power off the VM (may corrupt disk image)." + "reset":"Forcefully power cycle the VM (may corrupt disk image)." + "delete":"Delete Boot2Docker VM and its disk image." + "destroy":"Delete Boot2Docker VM and its disk image." + "config":"Show selected profile file settings." + "cfg":"Show selected profile file settings." + "info":"Display detailed information of VM." + "ip":"Display the IP address of the VM's Host-only network." + "socket":"Display the DOCKER_HOST socket to connect to." + "shellinit":"Display the shell command to set up the Docker client." + "status":"Display current state of VM." + "download":"Download Boot2Docker ISO image." + "upgrade":"Upgrade the Boot2Docker ISO image (restart if running)." + "version":"Display version information." +) + +_arguments \ + '(--basevmdk)--basevmdk[Path to VMDK to use as base for persistent partition]' \ + '(--cpus)'{-c,--cpus}'[number of CPUs for boot2docker.]' \ + '(--clobber)--clobber[overwrite Docker client binary on boot2docker upgrade]' \ + '(--dhcp)--dhcp[enable VirtualBox host-only network DHCP.]' \ + '(--dhcpip)--dhcpip[VirtualBox host-only network DHCP server address.]' \ + '(-s --disksize)'{-s,--disksize}'[boot2docker disk image size (in MB).]' \ + '(--dockerport)--dockerport[host Docker port (forward to port 2376 in VM). (deprecated - use with care)]' \ + '(--driver)--driver[hypervisor driver.]' \ + '(--force-upgrade-download)--force-upgrade-download[always download on boot2docker upgrade, never skip.]' \ + '(--hostip)--hostip[VirtualBox host-only network IP address.]' \ + '(--iso)--iso[path to boot2docker ISO image.]' \ + '(--iso-url)--iso-url[/api.github.com/repos/boot2docker/boot2docker/releases": source URL to provision the boot2docker ISO image.]' \ + '(--lowerip)--lowerip[VirtualBox host-only network DHCP lower bound.]' \ + '(--memory)'{-m,--memory}'[virtual machine memory size (in MB).]' \ + '(--netmask)--netmask[VirtualBox host-only network mask.]' \ + '(--no-dummy)--no-dummy[Example parameter for the dummy driver.]' \ + '(--retries)--retries[number of port knocking retries during 'start']' \ + '(--serial)--serial[try serial console to get IP address (experimental)]' \ + '(--serialfile)--serialfile[path to the serial socket/pipe.]' \ + '(--ssh)--ssh[path to SSH client utility.]' \ + '(--ssh-keygen)--ssh-keygen[path to ssh-keygen utility.]' \ + '(--sshkey)--sshkey[path to SSH key to use.]' \ + '(--sshport)--sshport[host SSH port (forward to port 22 in VM).]' \ + '(--upperip)--upperip[VirtualBox host-only network DHCP upper bound.]' \ + '(--vbm)--vbm[path to VirtualBox management utility.]' \ + '(--vbox-share)--vbox-share[(defaults to "/Users=Users" if no shares are specified; use "disable" to explicitly prevent any shares from being created) List of directories to share during "up|start|boot" via VirtualBox Guest Additions, with optional labels]' \ + '(--verbose)'{-v,--verbose}'[display verbose command invocations.]' \ + '(--vm)--vm[virtual machine name.]' \ + '(--waittime)--waittime[Time in milliseconds to wait between port knocking retries during 'start']' \ + '*:: :->subcmds' && return 0 + +#_arguments '*:: :->command' + +if (( CURRENT == 1 )); then + _describe -t commands "boot2docker command" _1st_arguments + return +fi diff --git a/plugins/brew/_brew b/plugins/brew/_brew index d11aa245d..4c99a383a 100644 --- a/plugins/brew/_brew +++ b/plugins/brew/_brew @@ -35,6 +35,7 @@ _1st_arguments=( 'info:information about a formula' 'install:install a formula' 'reinstall:install a formula anew; re-using its current options' + 'leaves:show installed formulae that are not dependencies of another installed formula' 'link:link a formula' 'list:list files in a formula or not-installed formulae' 'log:git commit log for a formula' diff --git a/plugins/brew/brew.plugin.zsh b/plugins/brew/brew.plugin.zsh index 42fb80c9a..5b5847328 100644 --- a/plugins/brew/brew.plugin.zsh +++ b/plugins/brew/brew.plugin.zsh @@ -1,2 +1,4 @@ alias brews='brew list -1' -alias bubu="brew update && brew upgrade && brew cleanup" +alias bubo='brew update && brew outdated' +alias bubc='brew upgrade && brew cleanup' +alias bubu='bubo && bubc' diff --git a/plugins/bundler/README.md b/plugins/bundler/README.md index 56f0c7176..edd95ccc2 100644 --- a/plugins/bundler/README.md +++ b/plugins/bundler/README.md @@ -39,7 +39,7 @@ This will exclude the `foreman` and `spin` gems (i.e. their executable) from bei ## Excluded gems -These gems should not be called with `bundle exec`. Please see the Issues on GitHub for clarification. +These gems should not be called with `bundle exec`. Please see [issue #2923](https://github.com/robbyrussell/oh-my-zsh/pull/2923) on GitHub for clarification. `berks` `foreman` diff --git a/plugins/bundler/bundler.plugin.zsh b/plugins/bundler/bundler.plugin.zsh index ba3d3f623..dfff6956e 100644 --- a/plugins/bundler/bundler.plugin.zsh +++ b/plugins/bundler/bundler.plugin.zsh @@ -4,6 +4,7 @@ alias bp="bundle package" alias bo="bundle open" alias bu="bundle update" alias bi="bundle_install" +alias bcn="bundle clean" bundled_commands=( annotate diff --git a/plugins/cakephp3/cakephp3.plugin.zsh b/plugins/cakephp3/cakephp3.plugin.zsh new file mode 100644 index 000000000..28d5af2ea --- /dev/null +++ b/plugins/cakephp3/cakephp3.plugin.zsh @@ -0,0 +1,19 @@ +# CakePHP 3 basic command completion +_cakephp3_get_command_list () { + cakephp3commands=($(bin/cake completion commands));printf "%s\n" "${cakephp3commands[@]}" +} + +_cakephp3 () { + if [ -f bin/cake ]; then + compadd `_cakephp3_get_command_list` + fi +} + +compdef _cakephp3 bin/cake +compdef _cakephp3 cake + +#Alias +alias c3='bin/cake' + +alias c3cache='bin/cake orm_cache clear' +alias c3migrate='bin/cake migrations migrate' diff --git a/plugins/capistrano/_capistrano b/plugins/capistrano/_capistrano index 3cadf3d54..e6e71ffcc 100644 --- a/plugins/capistrano/_capistrano +++ b/plugins/capistrano/_capistrano @@ -1,10 +1,49 @@ -#compdef cap +#compdef shipit #autoload -if [[ -f config/deploy.rb || -f Capfile ]]; then - if [[ ! -f .cap_tasks~ || config/deploy.rb -nt .cap_tasks~ ]]; then - echo "\nGenerating .cap_tasks~..." > /dev/stderr - cap -v --tasks | grep '#' | cut -d " " -f 2 > .cap_tasks~ +# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work. +# http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module + +local curcontext="$curcontext" state line ret=1 +local -a _configs + +_arguments -C \ + '1: :->cmds' \ + '2:: :->args' && ret=0 + +_cap_tasks() { + if [[ -f config/deploy.rb || -f Capfile ]]; then + if [[ ! -f .cap_tasks~ ]]; then + shipit -v --tasks | sed 's/\(\[\)\(.*\)\(\]\)/\2:/' | awk '{command=$2; $1=$2=$3=""; gsub(/^[ \t\r\n]+/, "", $0); gsub(":", "\\:", command); print command"["$0"]"}' > .cap_tasks~ + fi + + OLD_IFS=$IFS + IFS=$'\n' + _values 'cap commands' $(< .cap_tasks~) + IFS=$OLD_IFS + # zmodload zsh/mapfile + # _values ${(f)mapfile[.cap_tasks~]} fi - compadd `cat .cap_tasks~` -fi +} + +_cap_stages() { + compadd $(find config/deploy -name \*.rb | cut -d/ -f3 | sed s:.rb::g) +} + +case $state in + cmds) + # check if it uses multistage + if [[ -d config/deploy ]]; then + _cap_stages + else + _cap_tasks + fi + ret=0 + ;; + args) + _cap_tasks + ret=0 + ;; +esac + +return ret diff --git a/plugins/capistrano/capistrano.plugin.zsh b/plugins/capistrano/capistrano.plugin.zsh new file mode 100644 index 000000000..c85eb474c --- /dev/null +++ b/plugins/capistrano/capistrano.plugin.zsh @@ -0,0 +1,11 @@ +# Added `shipit` because `cap` is a reserved word. `cap` completion doesn't work. +# http://zsh.sourceforge.net/Doc/Release/Zsh-Modules.html#The-zsh_002fcap-Module + +func shipit() { + if [ -f Gemfile ] + then + bundle exec cap $* + else + cap $* + fi +} diff --git a/plugins/coffee/README.md b/plugins/coffee/README.md new file mode 100644 index 000000000..d0e7bbe74 --- /dev/null +++ b/plugins/coffee/README.md @@ -0,0 +1,31 @@ +## Coffeescript Plugin + +This plugin provides aliases for quickly compiling and previewing your +cofeescript code. + +When writing Coffeescript it's very common to want to preview the output of a +certain snippet of code, either because you want to test the output or because +you'd like to execute it in a browser console which doesn't accept Coffeescript. + +Preview the compiled result of your coffeescript with `cf "code"` as per the +following: + +```zsh +$ cf 'if a then be else c' +if (a) { + b; +} else { + c; +} +``` + +Also provides the following aliases: + +* **cfc:** Copies the compiled JS to your clipboard. Very useful when you want + to run the code in a JS console. + +* **cfp:** Compiles from your currently copied clipboard. Useful when you want + to compile large/multi-line snippets + +* **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the + the result back to clipboard. diff --git a/plugins/coffee/coffee.plugin.zsh b/plugins/coffee/coffee.plugin.zsh new file mode 100644 index 000000000..1a7bedd87 --- /dev/null +++ b/plugins/coffee/coffee.plugin.zsh @@ -0,0 +1,16 @@ +#!/bin/zsh + +# compile a string of coffeescript and print to output +cf () { + coffee -peb $1 +} +# compile & copy to clipboard +cfc () { + cf $1 | pbcopy +} + +# compile from pasteboard & print +alias cfp='coffeeMe "$(pbpaste)"' + +# compile from pasteboard and copy to clipboard +alias cfpc='cfp | pbcopy' diff --git a/plugins/common-aliases/common-aliases.plugin.zsh b/plugins/common-aliases/common-aliases.plugin.zsh index e3830adcf..fc19d73c3 100644 --- a/plugins/common-aliases/common-aliases.plugin.zsh +++ b/plugins/common-aliases/common-aliases.plugin.zsh @@ -13,7 +13,7 @@ alias lS='ls -1FSsh' alias lart='ls -1Fcart' alias lrt='ls -1Fcrt' -alias zshrc='vim ~/.zshrc' # Quick access to the ~/.zshrc file +alias zshrc='$EDITOR ~/.zshrc' # Quick access to the ~/.zshrc file alias grep='grep --color' alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} ' diff --git a/plugins/debian/debian.plugin.zsh b/plugins/debian/debian.plugin.zsh index 6e45e0521..31a772d60 100644 --- a/plugins/debian/debian.plugin.zsh +++ b/plugins/debian/debian.plugin.zsh @@ -9,8 +9,10 @@ # You can just set apt_pref='apt-get' to override it. if [[ -e $( which -p aptitude 2>&1 ) ]]; then apt_pref='aptitude' + apt_upgr='safe-upgrade' else apt_pref='apt-get' + apt_upgr='upgrade' fi # Use sudo by default if it's installed @@ -45,10 +47,10 @@ if [[ $use_sudo -eq 1 ]]; then alias abd='sudo $apt_pref build-dep' alias ac='sudo $apt_pref clean' alias ad='sudo $apt_pref update' - alias adg='sudo $apt_pref update && sudo $apt_pref upgrade' + alias adg='sudo $apt_pref update && sudo $apt_pref $apt_upgr' alias adu='sudo $apt_pref update && sudo $apt_pref dist-upgrade' alias afu='sudo apt-file update' - alias ag='sudo $apt_pref upgrade' + alias ag='sudo $apt_pref $apt_upgr' alias ai='sudo $apt_pref install' # Install all packages given on the command line while using only the first word of each line: # acs ... | ail @@ -80,10 +82,10 @@ else } alias ac='su -ls \'$apt_pref clean\' root' alias ad='su -lc \'$apt_pref update\' root' - alias adg='su -lc \'$apt_pref update && aptitude safe-upgrade\' root' + alias adg='su -lc \'$apt_pref update && aptitude $apt_upgr\' root' alias adu='su -lc \'$apt_pref update && aptitude dist-upgrade\' root' alias afu='su -lc "apt-file update"' - alias ag='su -lc \'$apt_pref safe-upgrade\' root' + alias ag='su -lc \'$apt_pref $apt_upgr\' root' ai() { cmd="su -lc 'aptitude -P install $@' root" print "$cmd" @@ -136,7 +138,7 @@ apt_pref_compdef abd "build-dep" apt_pref_compdef ac "clean" apt_pref_compdef ad "update" apt_pref_compdef afu "update" -apt_pref_compdef ag "upgrade" +apt_pref_compdef ag "$apt_upgr" apt_pref_compdef ai "install" apt_pref_compdef ail "install" apt_pref_compdef ap "purge" diff --git a/plugins/dirhistory/dirhistory.plugin.zsh b/plugins/dirhistory/dirhistory.plugin.zsh index d101cfcae..0209981e3 100644 --- a/plugins/dirhistory/dirhistory.plugin.zsh +++ b/plugins/dirhistory/dirhistory.plugin.zsh @@ -49,7 +49,8 @@ function push_future() { } # Called by zsh when directory changes -function chpwd() { +chpwd_functions+=(chpwd_dirhistory) +function chpwd_dirhistory() { push_past $PWD # If DIRHISTORY_CD is not set... if [[ -z "${DIRHISTORY_CD+x}" ]]; then diff --git a/plugins/dirpersist/dirpersist.plugin.zsh b/plugins/dirpersist/dirpersist.plugin.zsh index 88d1129d4..616e2c3c6 100644 --- a/plugins/dirpersist/dirpersist.plugin.zsh +++ b/plugins/dirpersist/dirpersist.plugin.zsh @@ -11,7 +11,8 @@ if [[ -f ${dirstack_file} ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then [[ -d $dirstack[1] ]] && cd $dirstack[1] && cd $OLDPWD fi -chpwd() { +chpwd_functions+=(chpwd_dirpersist) +chpwd_dirpersist() { if (( $DIRSTACKSIZE <= 0 )) || [[ -z $dirstack_file ]]; then return; fi local -ax my_stack my_stack=( ${PWD} ${dirstack} ) diff --git a/plugins/docker-compose/README.md b/plugins/docker-compose/README.md new file mode 100644 index 000000000..567b82148 --- /dev/null +++ b/plugins/docker-compose/README.md @@ -0,0 +1,5 @@ +# Docker-compose plugin for oh my zsh + +A copy of the completion script from the [docker-compose](1) git repo. + +[1]:[https://github.com/docker/compose/blob/master/contrib/completion/zsh/_docker-compose] diff --git a/plugins/docker-compose/_docker-compose b/plugins/docker-compose/_docker-compose new file mode 100644 index 000000000..19c06675a --- /dev/null +++ b/plugins/docker-compose/_docker-compose @@ -0,0 +1,308 @@ +#compdef docker-compose + +# Description +# ----------- +# zsh completion for docker-compose +# https://github.com/sdurrheimer/docker-compose-zsh-completion +# ------------------------------------------------------------------------- +# Version +# ------- +# 0.1.0 +# ------------------------------------------------------------------------- +# Authors +# ------- +# * Steve Durrheimer <s.durrheimer@gmail.com> +# ------------------------------------------------------------------------- +# Inspiration +# ----------- +# * @albers docker-compose bash completion script +# * @felixr docker zsh completion script : https://github.com/felixr/docker-zsh-completion +# ------------------------------------------------------------------------- + +# For compatibility reasons, Compose and therefore its completion supports several +# stack compositon files as listed here, in descending priority. +# Support for these filenames might be dropped in some future version. +__docker-compose_compose_file() { + local file + for file in docker-compose.y{,a}ml fig.y{,a}ml ; do + [ -e $file ] && { + echo $file + return + } + done + echo docker-compose.yml +} + +# Extracts all service names from docker-compose.yml. +___docker-compose_all_services_in_compose_file() { + local already_selected + local -a services + already_selected=$(echo ${words[@]} | tr " " "|") + awk -F: '/^[a-zA-Z0-9]/{print $1}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | grep -Ev "$already_selected" +} + +# All services, even those without an existing container +__docker-compose_services_all() { + services=$(___docker-compose_all_services_in_compose_file) + _alternative "args:services:($services)" +} + +# All services that have an entry with the given key in their docker-compose.yml section +___docker-compose_services_with_key() { + local already_selected + local -a buildable + already_selected=$(echo ${words[@]} | tr " " "|") + # flatten sections to one line, then filter lines containing the key and return section name. + awk '/^[a-zA-Z0-9]/{printf "\n"};{printf $0;next;}' "${compose_file:-$(__docker-compose_compose_file)}" 2>/dev/null | awk -F: -v key=": +$1:" '$0 ~ key {print $1}' 2>/dev/null | grep -Ev "$already_selected" +} + +# All services that are defined by a Dockerfile reference +__docker-compose_services_from_build() { + buildable=$(___docker-compose_services_with_key build) + _alternative "args:buildable services:($buildable)" +} + +# All services that are defined by an image +__docker-compose_services_from_image() { + pullable=$(___docker-compose_services_with_key image) + _alternative "args:pullable services:($pullable)" +} + +__docker-compose_get_services() { + local kind expl + declare -a running stopped lines args services + + docker_status=$(docker ps > /dev/null 2>&1) + if [ $? -ne 0 ]; then + _message "Error! Docker is not running." + return 1 + fi + + kind=$1 + shift + [[ $kind = (stopped|all) ]] && args=($args -a) + + lines=(${(f)"$(_call_program commands docker ps ${args})"}) + services=(${(f)"$(_call_program commands docker-compose 2>/dev/null ${compose_file:+-f $compose_file} ${compose_project:+-p $compose_project} ps -q)"}) + + # Parse header line to find columns + local i=1 j=1 k header=${lines[1]} + declare -A begin end + while (( $j < ${#header} - 1 )) { + i=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 1)) + j=$(( $i + ${${header[$i,-1]}[(i) ]} - 1)) + k=$(( $j + ${${header[$j,-1]}[(i)[^ ]]} - 2)) + begin[${header[$i,$(($j-1))]}]=$i + end[${header[$i,$(($j-1))]}]=$k + } + lines=(${lines[2,-1]}) + + # Container ID + local line s name + local -a names + for line in $lines; do + if [[ $services == *"${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}"* ]]; then + names=(${(ps:,:)${${line[${begin[NAMES]},-1]}%% *}}) + for name in $names; do + s="${${name%_*}#*_}:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}" + s="$s, ${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}" + s="$s, ${${${line[$begin[IMAGE],$end[IMAGE]]}/:/\\:}%% ##}" + if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then + stopped=($stopped $s) + else + running=($running $s) + fi + done + fi + done + + [[ $kind = (running|all) ]] && _describe -t services-running "running services" running + [[ $kind = (stopped|all) ]] && _describe -t services-stopped "stopped services" stopped +} + +__docker-compose_stoppedservices() { + __docker-compose_get_services stopped "$@" +} + +__docker-compose_runningservices() { + __docker-compose_get_services running "$@" +} + +__docker-compose_services () { + __docker-compose_get_services all "$@" +} + +__docker-compose_caching_policy() { + oldp=( "$1"(Nmh+1) ) # 1 hour + (( $#oldp )) +} + +__docker-compose_commands () { + local cache_policy + + zstyle -s ":completion:${curcontext}:" cache-policy cache_policy + if [[ -z "$cache_policy" ]]; then + zstyle ":completion:${curcontext}:" cache-policy __docker-compose_caching_policy + fi + + if ( [[ ${+_docker_compose_subcommands} -eq 0 ]] || _cache_invalid docker_compose_subcommands) \ + && ! _retrieve_cache docker_compose_subcommands; + then + local -a lines + lines=(${(f)"$(_call_program commands docker-compose 2>&1)"}) + _docker_compose_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I) *]}]}## #}/ ##/:}) + _store_cache docker_compose_subcommands _docker_compose_subcommands + fi + _describe -t docker-compose-commands "docker-compose command" _docker_compose_subcommands +} + +__docker-compose_subcommand () { + local -a _command_args + integer ret=1 + case "$words[1]" in + (build) + _arguments \ + '--no-cache[Do not use cache when building the image]' \ + '*:services:__docker-compose_services_from_build' && ret=0 + ;; + (help) + _arguments ':subcommand:__docker-compose_commands' && ret=0 + ;; + (kill) + _arguments \ + '-s[SIGNAL to send to the container. Default signal is SIGKILL.]:signal:_signals' \ + '*:running services:__docker-compose_runningservices' && ret=0 + ;; + (logs) + _arguments \ + '--no-color[Produce monochrome output.]' \ + '*:services:__docker-compose_services_all' && ret=0 + ;; + (migrate-to-labels) + _arguments \ + '(-):Recreate containers to add labels' && ret=0 + ;; + (port) + _arguments \ + '--protocol=-[tcp or udap (defaults to tcp)]:protocol:(tcp udp)' \ + '--index=-[index of the container if there are mutiple instances of a service (defaults to 1)]:index: ' \ + '1:running services:__docker-compose_runningservices' \ + '2:port:_ports' && ret=0 + ;; + (ps) + _arguments \ + '-q[Only display IDs]' \ + '*:services:__docker-compose_services_all' && ret=0 + ;; + (pull) + _arguments \ + '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \ + '*:services:__docker-compose_services_from_image' && ret=0 + ;; + (rm) + _arguments \ + '(-f --force)'{-f,--force}"[Don't ask to confirm removal]" \ + '-v[Remove volumes associated with containers]' \ + '*:stopped services:__docker-compose_stoppedservices' && ret=0 + ;; + (run) + _arguments \ + '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \ + '-d[Detached mode: Run container in the background, print new container name.]' \ + '--entrypoint[Overwrite the entrypoint of the image.]:entry point: ' \ + '*-e[KEY=VAL Set an environment variable (can be used multiple times)]:environment variable KEY=VAL: ' \ + '(-u --user)'{-u,--user=-}'[Run as specified username or uid]:username or uid:_users' \ + "--no-deps[Don't start linked services.]" \ + '--rm[Remove container after run. Ignored in detached mode.]' \ + "--service-ports[Run command with the service's ports enabled and mapped to the host.]" \ + '-T[Disable pseudo-tty allocation. By default `docker-compose run` allocates a TTY.]' \ + '(-):services:__docker-compose_services' \ + '(-):command: _command_names -e' \ + '*::arguments: _normal' && ret=0 + ;; + (scale) + _arguments '*:running services:__docker-compose_runningservices' && ret=0 + ;; + (start) + _arguments '*:stopped services:__docker-compose_stoppedservices' && ret=0 + ;; + (stop|restart) + _arguments \ + '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \ + '*:running services:__docker-compose_runningservices' && ret=0 + ;; + (up) + _arguments \ + '--allow-insecure-ssl[Allow insecure connections to the docker registry]' \ + '-d[Detached mode: Run containers in the background, print new container names.]' \ + '--no-color[Produce monochrome output.]' \ + "--no-deps[Don't start linked services.]" \ + "--no-recreate[If containers already exist, don't recreate them.]" \ + "--no-build[Don't build an image, even if it's missing]" \ + '(-t --timeout)'{-t,--timeout}"[Specify a shutdown timeout in seconds. (default: 10)]:seconds: " \ + "--x-smart-recreate[Only recreate containers whose configuration or image needs to be updated. (EXPERIMENTAL)]" \ + '*:services:__docker-compose_services_all' && ret=0 + ;; + (version) + _arguments \ + "--short[Shows only Compose's version number.]" && ret=0 + ;; + (*) + _message 'Unknown sub command' + esac + + return ret +} + +_docker-compose () { + # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`. + # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`. + if [[ $service != docker-compose ]]; then + _call_function - _$service + return + fi + + local curcontext="$curcontext" state line ret=1 + typeset -A opt_args + + _arguments -C \ + '(- :)'{-h,--help}'[Get help]' \ + '--verbose[Show more output]' \ + '(- :)'{-v,--version}'[Print version and exit]' \ + '(-f --file)'{-f,--file}'[Specify an alternate docker-compose file (default: docker-compose.yml)]:file:_files -g "*.yml"' \ + '(-p --project-name)'{-p,--project-name}'[Specify an alternate project name (default: directory name)]:project name:' \ + '(-): :->command' \ + '(-)*:: :->option-or-argument' && ret=0 + + local counter=1 + #local compose_file compose_project + while [ $counter -lt ${#words[@]} ]; do + case "${words[$counter]}" in + -f|--file) + (( counter++ )) + compose_file="${words[$counter]}" + ;; + -p|--project-name) + (( counter++ )) + compose_project="${words[$counter]}" + ;; + *) + ;; + esac + (( counter++ )) + done + + case $state in + (command) + __docker-compose_commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*:*}:docker-compose-$words[1]: + __docker-compose_subcommand && ret=0 + ;; + esac + + return ret +} + +_docker-compose "$@" diff --git a/plugins/docker/_docker b/plugins/docker/_docker index fd459a0ca..a82a31ad3 100644 --- a/plugins/docker/_docker +++ b/plugins/docker/_docker @@ -27,7 +27,7 @@ __docker_all_containers() { # output a selectable list of all docker images __docker_images() { declare -a img_cmd - img_cmd=($(docker images | awk 'NR>1{print $1}')) + img_cmd=($(docker images | awk 'NR>1{print $1}'| sed 's/:/\\:/g')) _describe 'images' img_cmd } @@ -36,7 +36,7 @@ __docker_images() { # --------------------------- __attach() { _arguments \ - '--no-stdin[Do not attach stdin]' \ + '--no-stdin[Do not attach STDIN]' \ '--sig-proxy[Proxify all received signal to the process (even in non-tty mode)]' __docker_containers } @@ -52,16 +52,59 @@ __build() { __commit() { _arguments \ - '(-a,--author=)'{-a,--author=}'[Author (eg. "John Hannibal Smith <hannibal@a-team.com>"]' \ + '(-a,--author=)'{-a,--author=}'[Author (e.g. "John Hannibal Smith <hannibal@a-team.com>")]' \ + '(-c,--change=)'{-c,--change=}'[Apply Dockerfile instruction to the created image]' \ '(-m,--message=)'{-m,--message=}'[Commit message]' \ - '--run=[Config automatically applied when the image is run.]' - __docker_containers + '(-p,--pause=)'{-p,--pause=}'[Pause container during commit]' \ } __cp() { __docker_containers } +__create() { + _arguments \ + '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \ + '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \ + '--add-host=[Add a custom host-to-IP mapping]' \ + '--cap-add=[Add Linux capabilities]' \ + '--cap-drop=[Drop Linux capabilities]' \ + '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \ + '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \ + '--cidfile=[Write the container ID to the file]' \ + '--device=[Add a host device to the container]' \ + '--dns=[Set custom dns servers]' \ + '--dns-search=[Set custom DNS search domains]' \ + '(-e,--env=)'{-e,--env=}'[Set environment variables]' \ + '--env-file=[Read in a file of environment variables]' \ + '--entrypoint=[Overwrite the default entrypoint of the image]' \ + '--expose=[Expose a port from the container without publishing it to your host]' \ + '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \ + '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \ + '--ipc=[IPC namespace to use]' \ + '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \ + '--link=[Add link to another container (name:alias)]' \ + '--log-driver=[Logging driver for the container]' \ + '--lxc-conf=[Add custom LXC options]' \ + '--mac-address=[Container MAC address (e.g. 92:d0:c6:0a:29:33)]' \ + '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \ + '--net=[Set the Network mode for the container]' \ + '--name=[Assign a name to the container]' \ + '--pid=[PID namespace to use]' \ + '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort/protocol)]' \ + '--privileged=[Give extended privileges to this container]' \ + '--restart=[Restart policy to apply when a container exits]' \ + '--security-opt=[Security Options]' \ + '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \ + '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \ + '(-u,--user=)'{-u,--user=}'[Username or UID]' \ + '--ulimit=[Ulimit options]' \ + '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. -v /host:/container or -v /container)]' \ + '--volumes-from=[Mount volumes from the specified container(s)]' \ + '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]' + __docker_images +} + __diff() { __docker_containers } @@ -100,11 +143,6 @@ __info() { # no arguments } -__insert() { - __docker_images - _arguments '*:files:_files' -} - __inspect() { __docker_images __docker_all_containers @@ -185,28 +223,43 @@ __rmi() { __run() { _arguments \ '(-P,--publish-all=)'{-P,--publish-all=}'[Publish all exposed ports to the host interfaces]' \ - '(-a,--attach=)'{-a,--attach=}'[Attach to stdin, stdout or stderr.]' \ - '(-c,--cpu-shares=)'{-c,--cpu-shares=}': CPU shares (relative weight)]' \ + '(-a,--attach=)'{-a,--attach=}'[Attach to STDIN, STDOUT or STDERR]' \ + '--add-host=[Add a custom host-to-IP mapping]' \ + '--cap-add=[Add Linux capabilities]' \ + '--cap-drop=[Drop Linux capabilities]' \ + '--cpuset-cpus=[CPUs in which to allow execution (0-3, 0,1)]' \ + '(-c,--cpu-shares=)'{-c,--cpu-shares=}'[CPU shares (relative weight)]' \ '--cidfile=[Write the container ID to the file]' \ - '(-d,--detach=)'{-d,--detach=}'[Detached mode: Run container in the background, print new container id]' \ + '(-d,--detach=)'{-d,--detach=}'[Run container in the background, print new container id]' \ + '--device=[Add a host device to the container]' \ '--dns=[Set custom dns servers]' \ + '--dns-search=[Set custom DNS search domains]' \ '(-e,--env=)'{-e,--env=}'[Set environment variables]' \ + '--env-file=[Read in a file of environment variables]' \ '--entrypoint=[Overwrite the default entrypoint of the image]' \ '--expose=[Expose a port from the container without publishing it to your host]' \ '(-h,--hostname=)'{-h,--hostname=}'[Container host name]' \ - '(-i,--interactive=)'{-i,--interactive=}'[Keep stdin open even if not attached]' \ + '(-i,--interactive=)'{-i,--interactive=}'[Keep STDIN open even if not attached]' \ + '--ipc=[IPC namespace to use]' \ + '(-l,--label=)'{-l,--label=}'[Set meta data on a container]' \ '--link=[Add link to another container (name:alias)]' \ - '--lxc-conf=[Add custom lxc options -lxc-conf="lxc.cgroup.cpuset.cpus = 0,1"]' \ + '--log-driver=[Logging driver for the container]' \ + '--lxc-conf=[Add custom LXC options]' \ + '--mac-address=[Container MAC address (e.g. 92:d0:c6:0a:29:33)]' \ '(-m,--memory=)'{-m,--memory=}'[Memory limit (format: <number><optional unit>, where unit = b, k, m or g)]' \ - '(-n,--networking=)'{-n,--networking=}'[Enable networking for this container]' \ + '--net=[Set the Network mode for the container]' \ '--name=[Assign a name to the container]' \ - '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort) (use "docker port" to see the actual mapping)]' \ + '--pid=[PID namespace to use]' \ + '(-p,--publish=)'{-p,--publish=}'[Publish a container''s port to the host (format: ip:hostPort:containerPort/protocol)]' \ '--privileged=[Give extended privileges to this container]' \ + '--restart=[Restart policy to apply when a container exits]' \ '--rm=[Automatically remove the container when it exits (incompatible with -d)]' \ + '--security-opt=[Security Options]' \ '--sig-proxy=[Proxify all received signal to the process (even in non-tty mode)]' \ '(-t,--tty=)'{-t,--tty=}'[Allocate a pseudo-tty]' \ '(-u,--user=)'{-u,--user=}'[Username or UID]' \ - '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. from the host: -v /host:/container, from docker: -v /container)]' \ + '--ulimit=[Ulimit options]' \ + '(-v,--volume=)'{-v,--volume=}'[Bind mount a volume (e.g. -v /host:/container or -v /container)]' \ '--volumes-from=[Mount volumes from the specified container(s)]' \ '(-w,--workdir=)'{-w,--workdir=}'[Working directory inside the container]' __docker_images @@ -225,8 +278,8 @@ __save() { __start() { _arguments \ - '(-a,--attach=)'{-a,--attach=}'[Attach container''s stdout/stderr and forward all signals to the process]' \ - '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s stdin]' + '(-a,--attach=)'{-a,--attach=}'[Attach container''s STDOUT/STDERR and forward all signals to the process]' \ + '(-i,--interactive=)'{-i,--interactive=}'[Attach container''s STDIN]' __docker_all_containers } @@ -271,6 +324,7 @@ _1st_arguments=( "build":"Build a container from a Dockerfile" "commit":"Create a new image from a container's changes" "cp":"Copy files/folders from the containers filesystem to the host path" + "create":"Create new container without running it" "diff":"Inspect changes on a container's filesystem" "events":"Get real time events from the server" "export":"Stream the contents of a container as a tar archive" @@ -278,7 +332,6 @@ _1st_arguments=( "images":"List images" "import":"Create a new filesystem image from the contents of a tarball" "info":"Display system-wide information" - "insert":"Insert a file in an image" "inspect":"Return low-level information on a container" "kill":"Kill a running container" "load":"Load an image from a tar archive" @@ -321,6 +374,8 @@ case "$words[1]" in __commit ;; cp) __cp ;; + create) + __create ;; diff) __diff ;; events) @@ -335,8 +390,6 @@ case "$words[1]" in __import ;; info) __info ;; - insert) - __insert ;; inspect) __inspect ;; kill) diff --git a/plugins/ember-cli/README.md b/plugins/ember-cli/README.md index d1dedf884..482c347d2 100644 --- a/plugins/ember-cli/README.md +++ b/plugins/ember-cli/README.md @@ -1,22 +1,19 @@ -# Ember-cli +# Ember CLI -**Maintainer:** [BilalBudhani](http://www.github.com/BilalBudhani) +**Maintainers:** [BilalBudhani](http://www.github.com/BilalBudhani), [eubenesa](http://www.github.com/eubenesa) -Ember-cli (http://www.ember-cli.com/) +Ember CLI (http://www.ember-cli.com/) ### List of Aliases -alias es='ember serve' -alias ea='ember addon' -alias eb='ember build' -alias ed='ember destroy' -alias eg='ember generate' -alias eh='ember help' -alias ein='ember init' -alias eia='ember install:addon' -alias eib='ember install:bower' -alias ein='ember install:npm' -alias ei='ember install' -alias et='ember test' -alias eu='ember update' -alias ev='ember version' + alias es='ember serve' + alias ea='ember addon' + alias eb='ember build' + alias ed='ember destroy' + alias eg='ember generate' + alias eh='ember help' + alias ein='ember init' + alias ei='ember install' + alias et='ember test' + alias eu='ember update' + alias ev='ember version' diff --git a/plugins/ember-cli/ember-cli.plugin.zsh b/plugins/ember-cli/ember-cli.plugin.zsh index 044a2c043..a0f346829 100644 --- a/plugins/ember-cli/ember-cli.plugin.zsh +++ b/plugins/ember-cli/ember-cli.plugin.zsh @@ -1,5 +1,5 @@ -# Ember ClI -# visit http://www.ember-cli.com/ to view user guid +# Ember CLI +# Visit http://www.ember-cli.com/ to view user guide alias es='ember serve' alias ea='ember addon' @@ -8,9 +8,6 @@ alias ed='ember destroy' alias eg='ember generate' alias eh='ember help' alias ein='ember init' -alias eia='ember install:addon' -alias eib='ember install:bower' -alias ein='ember install:npm' alias ei='ember install' alias et='ember test' alias eu='ember update' diff --git a/plugins/emoji/README.md b/plugins/emoji/README.md new file mode 100644 index 000000000..889e567e6 --- /dev/null +++ b/plugins/emoji/README.md @@ -0,0 +1,135 @@ +# emoji plugin + +Support for conveniently working with Unicode emoji in Zsh. + +## Features + +This plugin provides support for working with Unicode emoji characters in `zsh` using human-readable identifiers. It provides global variables which map emoji names to the actual characters, country names to their flags, and some named groupings of emoji. It also provides associated functions for displaying them. + +#### Variables + +Variable | Description +----------------- | -------------------------------- + $emoji | Maps emoji names to characters + $emoji_flags | Maps country names to flag characters (using region indicators) + $emoji_groups | Named groups of emoji. Keys are group names; values are whitespace-separated lists of character names + +You may define new emoji groups at run time by modifying `$emoji_groups`. The special group name `all` is reserved for use by the plugin. You should not modify `$emoji` or `$emoji_flags`. + +#### Functions + +Function | Description +---------------- | ------------------------------- + random_emoji | Prints a random emoji character + display_emoji | Displays emoji, along with their names + +## Usage and Examples + +To output a specific emoji, use: +``` +$> echo $emoji[<name>] +``` +E.g.: +``` +$> echo $emoji[mouse_face] +``` + +To output a random emoji, use: +``` +$> random_emoji +``` +To output a random emoji from a particular group, use: +``` +$> random_emoji <group> +``` +E.g.: +``` +$> random_emoji fruits +$> random_emoji animals +$> random_emoji vehicles +$> random_emoji faces +``` + +The defined group names can be found with `echo ${(k)emoji_groups}`. + +To list all available emoji with their names, use: +``` +$> display_emoji +$> display_emoji fruits +$> display_emoji animals +$> display_emoji vehicles +$> display_emoji faces +``` + +To use emoji in a prompt: +``` +PROMPT="$emoji[penguin] > "" +PROMPT='$(random_emoji fruits) > ' +surfer=$emoji[surfer] +PROMPT="$surfer > " +``` + +## Technical Details + +The emoji names and codes are sourced from Unicode Technical Report \#51, which provides information on emoji support in Unicode. It can be found at http://www.unicode.org/reports/tr51/index.html. + +The group definitions are added by this OMZ plugin. They are not based on external definitions. (As far as I can tell. -apjanke) + +The values in the `$emoji*` maps are the emoji characters themselves, not escape sequences or other forms that require interpretation. They can be used in any context and do not require escape sequence support from commands like `echo` or `print`. + +The emoji in the main `$emoji` map are standalone character sequences which can all be output on their own, without worrying about combining characters. The values may actually be multi-code-point sequences, instead of a single code point, and may include combining characters in those sequences. But they're arranged so their effects do not extend beyond that sequence. + +The exception to this is the skin tone variation selectors. These are included in the main `$emoji` map because they can be displayed on their own, as well as used as combining characters. (If they follow a character that is not one of the emoji characters they combine with, they are displayed as color swatches.) + + +## Experimental Features + +This defines some additional variables and functions, but these are experimental and subject to change at any time. You shouldn't rely on them being available. They're mostly for the use of emoji plugin developers to help decide what to include in future revisions. + +Variables: + +Variable | Description +----------------- | -------------------------------- + $emoji2 | Auxiliary and combining characters + $emoji_skintone | Skin tone modifiers (from Unicode 8.0) + + +#### Skin Tone Variation Selection + +This includes experimental support for the skin tone Variation Selectors introduced with Unicode 8.0, which let you select different skin tones for emoji involving humans. + +NOTE: This really is experimental. The skin tone selectors are a relatively new feature and may not be supported by all systems. And the support in this plugin is a work in progress. It may not work in all places. In fact, I haven't gotten it to work anywhere yet. -apjanke + +The "variation selectors" are combining characters which change the appearance of the preceding character. A variation selector character can be output immediately following a human emoji to change its skin tone color. You can also output a variation selector on its own to display a color swatch of that skin tone. + +The `$emoji_skintone` associative array maps skin tone IDs to the variation selector characters. To use one, output it immediately following a smiley or other human emoji. + +``` +echo "$emoji[smiling_face_with_open_mouth]$emoji_skintone[4]" +``` + +Note that `$emoji_skintone` is an associative array, and its keys are the *names* of "Fitzpatrick Skin Type" groups, not linear indexes into a normal array. The names are `1_2`, `3`, `4`, `5`, and `6`. (Types 1 and 2 are combined into a single color.) See the [Diversity section in Unicode TR 51](http://www.unicode.org/reports/tr51/index.html#Diversity) for details. + +## TODO + +These are things that could be enhanced in future revisions of the plugin. + +* Incorporate CLDR data for ordering and groupings +* Short :bracket: style names (from gemoji) +* Incorporate `gemoji` data +* Country codes for flags +* ZWJ combining function? + +#### Gemoji support + +The [gemoji project](https://github.com/github/gemoji) seems to be the de facto main source for short names and other emoji-related metadata that isn't included in the official Unicode reports. (I'm saying this just from looking at the google results for "emoji short names" and related searches. -apjanke) + +If this plugin is updated to provide short names, CLDR sorting data, and similar stuff, it should probably be changed to use the Gemoji project, and the `update_emoji.pl` script be rewritten in Ruby so it can use the Gemoji library directly instead of parsing its data files. + +This does *not* mean that it should use Gemoji at run time. None of the `zsh` plugin stuff should call Gemoji or Ruby code. Rather, the "build time" `update_emoji.pl` script should be rewritten to use Gemoji to generate a pure-native-`zsh` character definition file which would be checked in to the repo and can be called by OMZ users without having Gemoji installed. + +#### ZWJ combining function + +One of the newer features of Unicode emoji is the ability to use the "Zero-Width Joiner" character to compose multiple emoji characters in to a single "emoji ligature" glyph. For example, this is [how Apple supports "family" emoji with various genders and skin tones](http://www.unicode.org/reports/tr51/index.html#ZWJ_Sequences). + +These are a pain to write out (and probably worse to read), and it might be convenient to have a couple functions for concisely composing them, if wider support for them appears. diff --git a/plugins/emoji/emoji-char-definitions.zsh b/plugins/emoji/emoji-char-definitions.zsh new file mode 100644 index 000000000..04693da05 --- /dev/null +++ b/plugins/emoji/emoji-char-definitions.zsh @@ -0,0 +1,1303 @@ + +# emoji-char-definitions.zsh - Emoji character definitions for oh-my-zsh emoji plugin +# +# This file is auto-generated by update_emoji.pl. Do not edit it manually. +# +# This contains the definition for: +# $emoji - which maps character names to Unicode characters +# $emoji_flags - maps country names to Unicode flag characters using region indicators + +# Main emoji +typeset -gAH emoji +# National flags +typeset -gAH emoji_flags +# Combining modifiers +typeset -gAH emoji_mod + +emoji[copyright_sign]=$'\U00A9' +emoji[registered_sign]=$'\U00AE' +emoji[double_exclamation_mark]=$'\U203C' +emoji[exclamation_question_mark]=$'\U2049' +emoji[trade_mark_sign]=$'\U2122' +emoji[information_source]=$'\U2139' +emoji[left_right_arrow]=$'\U2194' +emoji[up_down_arrow]=$'\U2195' +emoji[north_west_arrow]=$'\U2196' +emoji[north_east_arrow]=$'\U2197' +emoji[south_east_arrow]=$'\U2198' +emoji[south_west_arrow]=$'\U2199' +emoji[leftwards_arrow_with_hook]=$'\U21A9' +emoji[rightwards_arrow_with_hook]=$'\U21AA' +emoji[watch]=$'\U231A' +emoji[hourglass]=$'\U231B' +emoji[keyboard]=$'\U2328' +emoji[eject_symbol]=$'\U23CF' +emoji[black_right_pointing_double_triangle]=$'\U23E9' +emoji[black_left_pointing_double_triangle]=$'\U23EA' +emoji[black_up_pointing_double_triangle]=$'\U23EB' +emoji[black_down_pointing_double_triangle]=$'\U23EC' +emoji[black_right_pointing_double_triangle_with_vertical_bar]=$'\U23ED' +emoji[black_left_pointing_double_triangle_with_vertical_bar]=$'\U23EE' +emoji[black_right_pointing_triangle_with_double_vertical_bar]=$'\U23EF' +emoji[alarm_clock]=$'\U23F0' +emoji[stopwatch]=$'\U23F1' +emoji[timer_clock]=$'\U23F2' +emoji[hourglass_with_flowing_sand]=$'\U23F3' +emoji[double_vertical_bar]=$'\U23F8' +emoji[black_square_for_stop]=$'\U23F9' +emoji[black_circle_for_record]=$'\U23FA' +emoji[circled_latin_capital_letter_m]=$'\U24C2' +emoji[black_small_square]=$'\U25AA' +emoji[white_small_square]=$'\U25AB' +emoji[black_right_pointing_triangle]=$'\U25B6' +emoji[black_left_pointing_triangle]=$'\U25C0' +emoji[white_medium_square]=$'\U25FB' +emoji[black_medium_square]=$'\U25FC' +emoji[white_medium_small_square]=$'\U25FD' +emoji[black_medium_small_square]=$'\U25FE' +emoji[black_sun_with_rays]=$'\U2600' +emoji[cloud]=$'\U2601' +emoji[umbrella]=$'\U2602' +emoji[snowman]=$'\U2603' +emoji[comet]=$'\U2604' +emoji[black_telephone]=$'\U260E' +emoji[ballot_box_with_check]=$'\U2611' +emoji[umbrella_with_rain_drops]=$'\U2614' +emoji[hot_beverage]=$'\U2615' +emoji[shamrock]=$'\U2618' +emoji[white_up_pointing_index]=$'\U261D' +emoji[skull_and_crossbones]=$'\U2620' +emoji[radioactive_sign]=$'\U2622' +emoji[biohazard_sign]=$'\U2623' +emoji[orthodox_cross]=$'\U2626' +emoji[star_and_crescent]=$'\U262A' +emoji[peace_symbol]=$'\U262E' +emoji[yin_yang]=$'\U262F' +emoji[wheel_of_dharma]=$'\U2638' +emoji[white_frowning_face]=$'\U2639' +emoji[white_smiling_face]=$'\U263A' +emoji[aries]=$'\U2648' +emoji[taurus]=$'\U2649' +emoji[gemini]=$'\U264A' +emoji[cancer]=$'\U264B' +emoji[leo]=$'\U264C' +emoji[virgo]=$'\U264D' +emoji[libra]=$'\U264E' +emoji[scorpius]=$'\U264F' +emoji[sagittarius]=$'\U2650' +emoji[capricorn]=$'\U2651' +emoji[aquarius]=$'\U2652' +emoji[pisces]=$'\U2653' +emoji[black_spade_suit]=$'\U2660' +emoji[black_club_suit]=$'\U2663' +emoji[black_heart_suit]=$'\U2665' +emoji[black_diamond_suit]=$'\U2666' +emoji[hot_springs]=$'\U2668' +emoji[black_universal_recycling_symbol]=$'\U267B' +emoji[wheelchair_symbol]=$'\U267F' +emoji[hammer_and_pick]=$'\U2692' +emoji[anchor]=$'\U2693' +emoji[crossed_swords]=$'\U2694' +emoji[scales]=$'\U2696' +emoji[alembic]=$'\U2697' +emoji[gear]=$'\U2699' +emoji[atom_symbol]=$'\U269B' +emoji[fleur_de_lis]=$'\U269C' +emoji[warning_sign]=$'\U26A0' +emoji[high_voltage_sign]=$'\U26A1' +emoji[medium_white_circle]=$'\U26AA' +emoji[medium_black_circle]=$'\U26AB' +emoji[coffin]=$'\U26B0' +emoji[funeral_urn]=$'\U26B1' +emoji[soccer_ball]=$'\U26BD' +emoji[baseball]=$'\U26BE' +emoji[snowman_without_snow]=$'\U26C4' +emoji[sun_behind_cloud]=$'\U26C5' +emoji[thunder_cloud_and_rain]=$'\U26C8' +emoji[ophiuchus]=$'\U26CE' +emoji[pick]=$'\U26CF' +emoji[helmet_with_white_cross]=$'\U26D1' +emoji[chains]=$'\U26D3' +emoji[no_entry]=$'\U26D4' +emoji[shinto_shrine]=$'\U26E9' +emoji[church]=$'\U26EA' +emoji[mountain]=$'\U26F0' +emoji[umbrella_on_ground]=$'\U26F1' +emoji[fountain]=$'\U26F2' +emoji[flag_in_hole]=$'\U26F3' +emoji[ferry]=$'\U26F4' +emoji[sailboat]=$'\U26F5' +emoji[skier]=$'\U26F7' +emoji[ice_skate]=$'\U26F8' +emoji[person_with_ball]=$'\U26F9' +emoji[tent]=$'\U26FA' +emoji[fuel_pump]=$'\U26FD' +emoji[black_scissors]=$'\U2702' +emoji[white_heavy_check_mark]=$'\U2705' +emoji[airplane]=$'\U2708' +emoji[envelope]=$'\U2709' +emoji[raised_fist]=$'\U270A' +emoji[raised_hand]=$'\U270B' +emoji[victory_hand]=$'\U270C' +emoji[writing_hand]=$'\U270D' +emoji[pencil]=$'\U270F' +emoji[black_nib]=$'\U2712' +emoji[heavy_check_mark]=$'\U2714' +emoji[heavy_multiplication_x]=$'\U2716' +emoji[latin_cross]=$'\U271D' +emoji[star_of_david]=$'\U2721' +emoji[sparkles]=$'\U2728' +emoji[eight_spoked_asterisk]=$'\U2733' +emoji[eight_pointed_black_star]=$'\U2734' +emoji[snowflake]=$'\U2744' +emoji[sparkle]=$'\U2747' +emoji[cross_mark]=$'\U274C' +emoji[negative_squared_cross_mark]=$'\U274E' +emoji[black_question_mark_ornament]=$'\U2753' +emoji[white_question_mark_ornament]=$'\U2754' +emoji[white_exclamation_mark_ornament]=$'\U2755' +emoji[heavy_exclamation_mark_symbol]=$'\U2757' +emoji[heavy_heart_exclamation_mark_ornament]=$'\U2763' +emoji[heavy_black_heart]=$'\U2764' +emoji[heavy_plus_sign]=$'\U2795' +emoji[heavy_minus_sign]=$'\U2796' +emoji[heavy_division_sign]=$'\U2797' +emoji[black_rightwards_arrow]=$'\U27A1' +emoji[curly_loop]=$'\U27B0' +emoji[double_curly_loop]=$'\U27BF' +emoji[arrow_pointing_rightwards_then_curving_upwards]=$'\U2934' +emoji[arrow_pointing_rightwards_then_curving_downwards]=$'\U2935' +emoji[leftwards_black_arrow]=$'\U2B05' +emoji[upwards_black_arrow]=$'\U2B06' +emoji[downwards_black_arrow]=$'\U2B07' +emoji[black_large_square]=$'\U2B1B' +emoji[white_large_square]=$'\U2B1C' +emoji[white_medium_star]=$'\U2B50' +emoji[heavy_large_circle]=$'\U2B55' +emoji[wavy_dash]=$'\U3030' +emoji[part_alternation_mark]=$'\U303D' +emoji[circled_ideograph_congratulation]=$'\U3297' +emoji[circled_ideograph_secret]=$'\U3299' +emoji[mahjong_tile_red_dragon]=$'\U1F004' +emoji[playing_card_black_joker]=$'\U1F0CF' +emoji[negative_squared_latin_capital_letter_a]=$'\U1F170' +emoji[negative_squared_latin_capital_letter_b]=$'\U1F171' +emoji[negative_squared_latin_capital_letter_o]=$'\U1F17E' +emoji[negative_squared_latin_capital_letter_p]=$'\U1F17F' +emoji[negative_squared_ab]=$'\U1F18E' +emoji[squared_cl]=$'\U1F191' +emoji[squared_cool]=$'\U1F192' +emoji[squared_free]=$'\U1F193' +emoji[squared_id]=$'\U1F194' +emoji[squared_new]=$'\U1F195' +emoji[squared_ng]=$'\U1F196' +emoji[squared_ok]=$'\U1F197' +emoji[squared_sos]=$'\U1F198' +emoji[squared_up_with_exclamation_mark]=$'\U1F199' +emoji[squared_vs]=$'\U1F19A' +emoji[squared_katakana_koko]=$'\U1F201' +emoji[squared_katakana_sa]=$'\U1F202' +emoji[squared_cjk_unified_ideograph_7121]=$'\U1F21A' +emoji[squared_cjk_unified_ideograph_6307]=$'\U1F22F' +emoji[squared_cjk_unified_ideograph_7981]=$'\U1F232' +emoji[squared_cjk_unified_ideograph_7a7a]=$'\U1F233' +emoji[squared_cjk_unified_ideograph_5408]=$'\U1F234' +emoji[squared_cjk_unified_ideograph_6e80]=$'\U1F235' +emoji[squared_cjk_unified_ideograph_6709]=$'\U1F236' +emoji[squared_cjk_unified_ideograph_6708]=$'\U1F237' +emoji[squared_cjk_unified_ideograph_7533]=$'\U1F238' +emoji[squared_cjk_unified_ideograph_5272]=$'\U1F239' +emoji[squared_cjk_unified_ideograph_55b6]=$'\U1F23A' +emoji[circled_ideograph_advantage]=$'\U1F250' +emoji[circled_ideograph_accept]=$'\U1F251' +emoji[cyclone]=$'\U1F300' +emoji[foggy]=$'\U1F301' +emoji[closed_umbrella]=$'\U1F302' +emoji[night_with_stars]=$'\U1F303' +emoji[sunrise_over_mountains]=$'\U1F304' +emoji[sunrise]=$'\U1F305' +emoji[cityscape_at_dusk]=$'\U1F306' +emoji[sunset_over_buildings]=$'\U1F307' +emoji[rainbow]=$'\U1F308' +emoji[bridge_at_night]=$'\U1F309' +emoji[water_wave]=$'\U1F30A' +emoji[volcano]=$'\U1F30B' +emoji[milky_way]=$'\U1F30C' +emoji[earth_globe_europe_africa]=$'\U1F30D' +emoji[earth_globe_americas]=$'\U1F30E' +emoji[earth_globe_asia_australia]=$'\U1F30F' +emoji[globe_with_meridians]=$'\U1F310' +emoji[new_moon_symbol]=$'\U1F311' +emoji[waxing_crescent_moon_symbol]=$'\U1F312' +emoji[first_quarter_moon_symbol]=$'\U1F313' +emoji[waxing_gibbous_moon_symbol]=$'\U1F314' +emoji[full_moon_symbol]=$'\U1F315' +emoji[waning_gibbous_moon_symbol]=$'\U1F316' +emoji[last_quarter_moon_symbol]=$'\U1F317' +emoji[waning_crescent_moon_symbol]=$'\U1F318' +emoji[crescent_moon]=$'\U1F319' +emoji[new_moon_with_face]=$'\U1F31A' +emoji[first_quarter_moon_with_face]=$'\U1F31B' +emoji[last_quarter_moon_with_face]=$'\U1F31C' +emoji[full_moon_with_face]=$'\U1F31D' +emoji[sun_with_face]=$'\U1F31E' +emoji[glowing_star]=$'\U1F31F' +emoji[shooting_star]=$'\U1F320' +emoji[thermometer]=$'\U1F321' +emoji[white_sun_with_small_cloud]=$'\U1F324' +emoji[white_sun_behind_cloud]=$'\U1F325' +emoji[white_sun_behind_cloud_with_rain]=$'\U1F326' +emoji[cloud_with_rain]=$'\U1F327' +emoji[cloud_with_snow]=$'\U1F328' +emoji[cloud_with_lightning]=$'\U1F329' +emoji[cloud_with_tornado]=$'\U1F32A' +emoji[fog]=$'\U1F32B' +emoji[wind_blowing_face]=$'\U1F32C' +emoji[hot_dog]=$'\U1F32D' +emoji[taco]=$'\U1F32E' +emoji[burrito]=$'\U1F32F' +emoji[chestnut]=$'\U1F330' +emoji[seedling]=$'\U1F331' +emoji[evergreen_tree]=$'\U1F332' +emoji[deciduous_tree]=$'\U1F333' +emoji[palm_tree]=$'\U1F334' +emoji[cactus]=$'\U1F335' +emoji[hot_pepper]=$'\U1F336' +emoji[tulip]=$'\U1F337' +emoji[cherry_blossom]=$'\U1F338' +emoji[rose]=$'\U1F339' +emoji[hibiscus]=$'\U1F33A' +emoji[sunflower]=$'\U1F33B' +emoji[blossom]=$'\U1F33C' +emoji[ear_of_maize]=$'\U1F33D' +emoji[ear_of_rice]=$'\U1F33E' +emoji[herb]=$'\U1F33F' +emoji[four_leaf_clover]=$'\U1F340' +emoji[maple_leaf]=$'\U1F341' +emoji[fallen_leaf]=$'\U1F342' +emoji[leaf_fluttering_in_wind]=$'\U1F343' +emoji[mushroom]=$'\U1F344' +emoji[tomato]=$'\U1F345' +emoji[aubergine]=$'\U1F346' +emoji[grapes]=$'\U1F347' +emoji[melon]=$'\U1F348' +emoji[watermelon]=$'\U1F349' +emoji[tangerine]=$'\U1F34A' +emoji[lemon]=$'\U1F34B' +emoji[banana]=$'\U1F34C' +emoji[pineapple]=$'\U1F34D' +emoji[red_apple]=$'\U1F34E' +emoji[green_apple]=$'\U1F34F' +emoji[pear]=$'\U1F350' +emoji[peach]=$'\U1F351' +emoji[cherries]=$'\U1F352' +emoji[strawberry]=$'\U1F353' +emoji[hamburger]=$'\U1F354' +emoji[slice_of_pizza]=$'\U1F355' +emoji[meat_on_bone]=$'\U1F356' +emoji[poultry_leg]=$'\U1F357' +emoji[rice_cracker]=$'\U1F358' +emoji[rice_ball]=$'\U1F359' +emoji[cooked_rice]=$'\U1F35A' +emoji[curry_and_rice]=$'\U1F35B' +emoji[steaming_bowl]=$'\U1F35C' +emoji[spaghetti]=$'\U1F35D' +emoji[bread]=$'\U1F35E' +emoji[french_fries]=$'\U1F35F' +emoji[roasted_sweet_potato]=$'\U1F360' +emoji[dango]=$'\U1F361' +emoji[oden]=$'\U1F362' +emoji[sushi]=$'\U1F363' +emoji[fried_shrimp]=$'\U1F364' +emoji[fish_cake_with_swirl_design]=$'\U1F365' +emoji[soft_ice_cream]=$'\U1F366' +emoji[shaved_ice]=$'\U1F367' +emoji[ice_cream]=$'\U1F368' +emoji[doughnut]=$'\U1F369' +emoji[cookie]=$'\U1F36A' +emoji[chocolate_bar]=$'\U1F36B' +emoji[candy]=$'\U1F36C' +emoji[lollipop]=$'\U1F36D' +emoji[custard]=$'\U1F36E' +emoji[honey_pot]=$'\U1F36F' +emoji[shortcake]=$'\U1F370' +emoji[bento_box]=$'\U1F371' +emoji[pot_of_food]=$'\U1F372' +emoji[cooking]=$'\U1F373' +emoji[fork_and_knife]=$'\U1F374' +emoji[teacup_without_handle]=$'\U1F375' +emoji[sake_bottle_and_cup]=$'\U1F376' +emoji[wine_glass]=$'\U1F377' +emoji[cocktail_glass]=$'\U1F378' +emoji[tropical_drink]=$'\U1F379' +emoji[beer_mug]=$'\U1F37A' +emoji[clinking_beer_mugs]=$'\U1F37B' +emoji[baby_bottle]=$'\U1F37C' +emoji[fork_and_knife_with_plate]=$'\U1F37D' +emoji[bottle_with_popping_cork]=$'\U1F37E' +emoji[popcorn]=$'\U1F37F' +emoji[ribbon]=$'\U1F380' +emoji[wrapped_present]=$'\U1F381' +emoji[birthday_cake]=$'\U1F382' +emoji[jack_o_lantern]=$'\U1F383' +emoji[christmas_tree]=$'\U1F384' +emoji[father_christmas]=$'\U1F385' +emoji[fireworks]=$'\U1F386' +emoji[firework_sparkler]=$'\U1F387' +emoji[balloon]=$'\U1F388' +emoji[party_popper]=$'\U1F389' +emoji[confetti_ball]=$'\U1F38A' +emoji[tanabata_tree]=$'\U1F38B' +emoji[crossed_flags]=$'\U1F38C' +emoji[pine_decoration]=$'\U1F38D' +emoji[japanese_dolls]=$'\U1F38E' +emoji[carp_streamer]=$'\U1F38F' +emoji[wind_chime]=$'\U1F390' +emoji[moon_viewing_ceremony]=$'\U1F391' +emoji[school_satchel]=$'\U1F392' +emoji[graduation_cap]=$'\U1F393' +emoji[military_medal]=$'\U1F396' +emoji[reminder_ribbon]=$'\U1F397' +emoji[studio_microphone]=$'\U1F399' +emoji[level_slider]=$'\U1F39A' +emoji[control_knobs]=$'\U1F39B' +emoji[film_frames]=$'\U1F39E' +emoji[admission_tickets]=$'\U1F39F' +emoji[carousel_horse]=$'\U1F3A0' +emoji[ferris_wheel]=$'\U1F3A1' +emoji[roller_coaster]=$'\U1F3A2' +emoji[fishing_pole_and_fish]=$'\U1F3A3' +emoji[microphone]=$'\U1F3A4' +emoji[movie_camera]=$'\U1F3A5' +emoji[cinema]=$'\U1F3A6' +emoji[headphone]=$'\U1F3A7' +emoji[artist_palette]=$'\U1F3A8' +emoji[top_hat]=$'\U1F3A9' +emoji[circus_tent]=$'\U1F3AA' +emoji[ticket]=$'\U1F3AB' +emoji[clapper_board]=$'\U1F3AC' +emoji[performing_arts]=$'\U1F3AD' +emoji[video_game]=$'\U1F3AE' +emoji[direct_hit]=$'\U1F3AF' +emoji[slot_machine]=$'\U1F3B0' +emoji[billiards]=$'\U1F3B1' +emoji[game_die]=$'\U1F3B2' +emoji[bowling]=$'\U1F3B3' +emoji[flower_playing_cards]=$'\U1F3B4' +emoji[musical_note]=$'\U1F3B5' +emoji[multiple_musical_notes]=$'\U1F3B6' +emoji[saxophone]=$'\U1F3B7' +emoji[guitar]=$'\U1F3B8' +emoji[musical_keyboard]=$'\U1F3B9' +emoji[trumpet]=$'\U1F3BA' +emoji[violin]=$'\U1F3BB' +emoji[musical_score]=$'\U1F3BC' +emoji[running_shirt_with_sash]=$'\U1F3BD' +emoji[tennis_racquet_and_ball]=$'\U1F3BE' +emoji[ski_and_ski_boot]=$'\U1F3BF' +emoji[basketball_and_hoop]=$'\U1F3C0' +emoji[chequered_flag]=$'\U1F3C1' +emoji[snowboarder]=$'\U1F3C2' +emoji[runner]=$'\U1F3C3' +emoji[surfer]=$'\U1F3C4' +emoji[sports_medal]=$'\U1F3C5' +emoji[trophy]=$'\U1F3C6' +emoji[horse_racing]=$'\U1F3C7' +emoji[american_football]=$'\U1F3C8' +emoji[rugby_football]=$'\U1F3C9' +emoji[swimmer]=$'\U1F3CA' +emoji[weight_lifter]=$'\U1F3CB' +emoji[golfer]=$'\U1F3CC' +emoji[racing_motorcycle]=$'\U1F3CD' +emoji[racing_car]=$'\U1F3CE' +emoji[cricket_bat_and_ball]=$'\U1F3CF' +emoji[volleyball]=$'\U1F3D0' +emoji[field_hockey_stick_and_ball]=$'\U1F3D1' +emoji[ice_hockey_stick_and_puck]=$'\U1F3D2' +emoji[table_tennis_paddle_and_ball]=$'\U1F3D3' +emoji[snow_capped_mountain]=$'\U1F3D4' +emoji[camping]=$'\U1F3D5' +emoji[beach_with_umbrella]=$'\U1F3D6' +emoji[building_construction]=$'\U1F3D7' +emoji[house_buildings]=$'\U1F3D8' +emoji[cityscape]=$'\U1F3D9' +emoji[derelict_house_building]=$'\U1F3DA' +emoji[classical_building]=$'\U1F3DB' +emoji[desert]=$'\U1F3DC' +emoji[desert_island]=$'\U1F3DD' +emoji[national_park]=$'\U1F3DE' +emoji[stadium]=$'\U1F3DF' +emoji[house_building]=$'\U1F3E0' +emoji[house_with_garden]=$'\U1F3E1' +emoji[office_building]=$'\U1F3E2' +emoji[japanese_post_office]=$'\U1F3E3' +emoji[european_post_office]=$'\U1F3E4' +emoji[hospital]=$'\U1F3E5' +emoji[bank]=$'\U1F3E6' +emoji[automated_teller_machine]=$'\U1F3E7' +emoji[hotel]=$'\U1F3E8' +emoji[love_hotel]=$'\U1F3E9' +emoji[convenience_store]=$'\U1F3EA' +emoji[school]=$'\U1F3EB' +emoji[department_store]=$'\U1F3EC' +emoji[factory]=$'\U1F3ED' +emoji[izakaya_lantern]=$'\U1F3EE' +emoji[japanese_castle]=$'\U1F3EF' +emoji[european_castle]=$'\U1F3F0' +emoji[waving_white_flag]=$'\U1F3F3' +emoji[waving_black_flag]=$'\U1F3F4' +emoji[rosette]=$'\U1F3F5' +emoji[label]=$'\U1F3F7' +emoji[badminton_racquet_and_shuttlecock]=$'\U1F3F8' +emoji[bow_and_arrow]=$'\U1F3F9' +emoji[amphora]=$'\U1F3FA' +emoji[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB' +emoji_mod[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB' +emoji[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC' +emoji_mod[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC' +emoji[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD' +emoji_mod[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD' +emoji[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE' +emoji_mod[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE' +emoji[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF' +emoji_mod[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF' +emoji[rat]=$'\U1F400' +emoji[mouse]=$'\U1F401' +emoji[ox]=$'\U1F402' +emoji[water_buffalo]=$'\U1F403' +emoji[cow]=$'\U1F404' +emoji[tiger]=$'\U1F405' +emoji[leopard]=$'\U1F406' +emoji[rabbit]=$'\U1F407' +emoji[cat]=$'\U1F408' +emoji[dragon]=$'\U1F409' +emoji[crocodile]=$'\U1F40A' +emoji[whale]=$'\U1F40B' +emoji[snail]=$'\U1F40C' +emoji[snake]=$'\U1F40D' +emoji[horse]=$'\U1F40E' +emoji[ram]=$'\U1F40F' +emoji[goat]=$'\U1F410' +emoji[sheep]=$'\U1F411' +emoji[monkey]=$'\U1F412' +emoji[rooster]=$'\U1F413' +emoji[chicken]=$'\U1F414' +emoji[dog]=$'\U1F415' +emoji[pig]=$'\U1F416' +emoji[boar]=$'\U1F417' +emoji[elephant]=$'\U1F418' +emoji[octopus]=$'\U1F419' +emoji[spiral_shell]=$'\U1F41A' +emoji[bug]=$'\U1F41B' +emoji[ant]=$'\U1F41C' +emoji[honeybee]=$'\U1F41D' +emoji[lady_beetle]=$'\U1F41E' +emoji[fish]=$'\U1F41F' +emoji[tropical_fish]=$'\U1F420' +emoji[blowfish]=$'\U1F421' +emoji[turtle]=$'\U1F422' +emoji[hatching_chick]=$'\U1F423' +emoji[baby_chick]=$'\U1F424' +emoji[front_facing_baby_chick]=$'\U1F425' +emoji[bird]=$'\U1F426' +emoji[penguin]=$'\U1F427' +emoji[koala]=$'\U1F428' +emoji[poodle]=$'\U1F429' +emoji[dromedary_camel]=$'\U1F42A' +emoji[bactrian_camel]=$'\U1F42B' +emoji[dolphin]=$'\U1F42C' +emoji[mouse_face]=$'\U1F42D' +emoji[cow_face]=$'\U1F42E' +emoji[tiger_face]=$'\U1F42F' +emoji[rabbit_face]=$'\U1F430' +emoji[cat_face]=$'\U1F431' +emoji[dragon_face]=$'\U1F432' +emoji[spouting_whale]=$'\U1F433' +emoji[horse_face]=$'\U1F434' +emoji[monkey_face]=$'\U1F435' +emoji[dog_face]=$'\U1F436' +emoji[pig_face]=$'\U1F437' +emoji[frog_face]=$'\U1F438' +emoji[hamster_face]=$'\U1F439' +emoji[wolf_face]=$'\U1F43A' +emoji[bear_face]=$'\U1F43B' +emoji[panda_face]=$'\U1F43C' +emoji[pig_nose]=$'\U1F43D' +emoji[paw_prints]=$'\U1F43E' +emoji[chipmunk]=$'\U1F43F' +emoji[eyes]=$'\U1F440' +emoji[eye]=$'\U1F441' +emoji[ear]=$'\U1F442' +emoji[nose]=$'\U1F443' +emoji[mouth]=$'\U1F444' +emoji[tongue]=$'\U1F445' +emoji[white_up_pointing_backhand_index]=$'\U1F446' +emoji[white_down_pointing_backhand_index]=$'\U1F447' +emoji[white_left_pointing_backhand_index]=$'\U1F448' +emoji[white_right_pointing_backhand_index]=$'\U1F449' +emoji[fisted_hand_sign]=$'\U1F44A' +emoji[waving_hand_sign]=$'\U1F44B' +emoji[ok_hand_sign]=$'\U1F44C' +emoji[thumbs_up_sign]=$'\U1F44D' +emoji[thumbs_down_sign]=$'\U1F44E' +emoji[clapping_hands_sign]=$'\U1F44F' +emoji[open_hands_sign]=$'\U1F450' +emoji[crown]=$'\U1F451' +emoji[womans_hat]=$'\U1F452' +emoji[eyeglasses]=$'\U1F453' +emoji[necktie]=$'\U1F454' +emoji[t_shirt]=$'\U1F455' +emoji[jeans]=$'\U1F456' +emoji[dress]=$'\U1F457' +emoji[kimono]=$'\U1F458' +emoji[bikini]=$'\U1F459' +emoji[womans_clothes]=$'\U1F45A' +emoji[purse]=$'\U1F45B' +emoji[handbag]=$'\U1F45C' +emoji[pouch]=$'\U1F45D' +emoji[mans_shoe]=$'\U1F45E' +emoji[athletic_shoe]=$'\U1F45F' +emoji[high_heeled_shoe]=$'\U1F460' +emoji[womans_sandal]=$'\U1F461' +emoji[womans_boots]=$'\U1F462' +emoji[footprints]=$'\U1F463' +emoji[bust_in_silhouette]=$'\U1F464' +emoji[busts_in_silhouette]=$'\U1F465' +emoji[boy]=$'\U1F466' +emoji[girl]=$'\U1F467' +emoji[man]=$'\U1F468' +emoji[woman]=$'\U1F469' +emoji[family]=$'\U1F46A' +emoji[man_and_woman_holding_hands]=$'\U1F46B' +emoji[two_men_holding_hands]=$'\U1F46C' +emoji[two_women_holding_hands]=$'\U1F46D' +emoji[police_officer]=$'\U1F46E' +emoji[woman_with_bunny_ears]=$'\U1F46F' +emoji[bride_with_veil]=$'\U1F470' +emoji[person_with_blond_hair]=$'\U1F471' +emoji[man_with_gua_pi_mao]=$'\U1F472' +emoji[man_with_turban]=$'\U1F473' +emoji[older_man]=$'\U1F474' +emoji[older_woman]=$'\U1F475' +emoji[baby]=$'\U1F476' +emoji[construction_worker]=$'\U1F477' +emoji[princess]=$'\U1F478' +emoji[japanese_ogre]=$'\U1F479' +emoji[japanese_goblin]=$'\U1F47A' +emoji[ghost]=$'\U1F47B' +emoji[baby_angel]=$'\U1F47C' +emoji[extraterrestrial_alien]=$'\U1F47D' +emoji[alien_monster]=$'\U1F47E' +emoji[imp]=$'\U1F47F' +emoji[skull]=$'\U1F480' +emoji[information_desk_person]=$'\U1F481' +emoji[guardsman]=$'\U1F482' +emoji[dancer]=$'\U1F483' +emoji[lipstick]=$'\U1F484' +emoji[nail_polish]=$'\U1F485' +emoji[face_massage]=$'\U1F486' +emoji[haircut]=$'\U1F487' +emoji[barber_pole]=$'\U1F488' +emoji[syringe]=$'\U1F489' +emoji[pill]=$'\U1F48A' +emoji[kiss_mark]=$'\U1F48B' +emoji[love_letter]=$'\U1F48C' +emoji[ring]=$'\U1F48D' +emoji[gem_stone]=$'\U1F48E' +emoji[kiss]=$'\U1F48F' +emoji[bouquet]=$'\U1F490' +emoji[couple_with_heart]=$'\U1F491' +emoji[wedding]=$'\U1F492' +emoji[beating_heart]=$'\U1F493' +emoji[broken_heart]=$'\U1F494' +emoji[two_hearts]=$'\U1F495' +emoji[sparkling_heart]=$'\U1F496' +emoji[growing_heart]=$'\U1F497' +emoji[heart_with_arrow]=$'\U1F498' +emoji[blue_heart]=$'\U1F499' +emoji[green_heart]=$'\U1F49A' +emoji[yellow_heart]=$'\U1F49B' +emoji[purple_heart]=$'\U1F49C' +emoji[heart_with_ribbon]=$'\U1F49D' +emoji[revolving_hearts]=$'\U1F49E' +emoji[heart_decoration]=$'\U1F49F' +emoji[diamond_shape_with_a_dot_inside]=$'\U1F4A0' +emoji[electric_light_bulb]=$'\U1F4A1' +emoji[anger_symbol]=$'\U1F4A2' +emoji[bomb]=$'\U1F4A3' +emoji[sleeping_symbol]=$'\U1F4A4' +emoji[collision_symbol]=$'\U1F4A5' +emoji[splashing_sweat_symbol]=$'\U1F4A6' +emoji[droplet]=$'\U1F4A7' +emoji[dash_symbol]=$'\U1F4A8' +emoji[pile_of_poo]=$'\U1F4A9' +emoji[flexed_biceps]=$'\U1F4AA' +emoji[dizzy_symbol]=$'\U1F4AB' +emoji[speech_balloon]=$'\U1F4AC' +emoji[thought_balloon]=$'\U1F4AD' +emoji[white_flower]=$'\U1F4AE' +emoji[hundred_points_symbol]=$'\U1F4AF' +emoji[money_bag]=$'\U1F4B0' +emoji[currency_exchange]=$'\U1F4B1' +emoji[heavy_dollar_sign]=$'\U1F4B2' +emoji[credit_card]=$'\U1F4B3' +emoji[banknote_with_yen_sign]=$'\U1F4B4' +emoji[banknote_with_dollar_sign]=$'\U1F4B5' +emoji[banknote_with_euro_sign]=$'\U1F4B6' +emoji[banknote_with_pound_sign]=$'\U1F4B7' +emoji[money_with_wings]=$'\U1F4B8' +emoji[chart_with_upwards_trend_and_yen_sign]=$'\U1F4B9' +emoji[seat]=$'\U1F4BA' +emoji[personal_computer]=$'\U1F4BB' +emoji[briefcase]=$'\U1F4BC' +emoji[minidisc]=$'\U1F4BD' +emoji[floppy_disk]=$'\U1F4BE' +emoji[optical_disc]=$'\U1F4BF' +emoji[dvd]=$'\U1F4C0' +emoji[file_folder]=$'\U1F4C1' +emoji[open_file_folder]=$'\U1F4C2' +emoji[page_with_curl]=$'\U1F4C3' +emoji[page_facing_up]=$'\U1F4C4' +emoji[calendar]=$'\U1F4C5' +emoji[tear_off_calendar]=$'\U1F4C6' +emoji[card_index]=$'\U1F4C7' +emoji[chart_with_upwards_trend]=$'\U1F4C8' +emoji[chart_with_downwards_trend]=$'\U1F4C9' +emoji[bar_chart]=$'\U1F4CA' +emoji[clipboard]=$'\U1F4CB' +emoji[pushpin]=$'\U1F4CC' +emoji[round_pushpin]=$'\U1F4CD' +emoji[paperclip]=$'\U1F4CE' +emoji[straight_ruler]=$'\U1F4CF' +emoji[triangular_ruler]=$'\U1F4D0' +emoji[bookmark_tabs]=$'\U1F4D1' +emoji[ledger]=$'\U1F4D2' +emoji[notebook]=$'\U1F4D3' +emoji[notebook_with_decorative_cover]=$'\U1F4D4' +emoji[closed_book]=$'\U1F4D5' +emoji[open_book]=$'\U1F4D6' +emoji[green_book]=$'\U1F4D7' +emoji[blue_book]=$'\U1F4D8' +emoji[orange_book]=$'\U1F4D9' +emoji[books]=$'\U1F4DA' +emoji[name_badge]=$'\U1F4DB' +emoji[scroll]=$'\U1F4DC' +emoji[memo]=$'\U1F4DD' +emoji[telephone_receiver]=$'\U1F4DE' +emoji[pager]=$'\U1F4DF' +emoji[fax_machine]=$'\U1F4E0' +emoji[satellite_antenna]=$'\U1F4E1' +emoji[public_address_loudspeaker]=$'\U1F4E2' +emoji[cheering_megaphone]=$'\U1F4E3' +emoji[outbox_tray]=$'\U1F4E4' +emoji[inbox_tray]=$'\U1F4E5' +emoji[package]=$'\U1F4E6' +emoji[e_mail_symbol]=$'\U1F4E7' +emoji[incoming_envelope]=$'\U1F4E8' +emoji[envelope_with_downwards_arrow_above]=$'\U1F4E9' +emoji[closed_mailbox_with_lowered_flag]=$'\U1F4EA' +emoji[closed_mailbox_with_raised_flag]=$'\U1F4EB' +emoji[open_mailbox_with_raised_flag]=$'\U1F4EC' +emoji[open_mailbox_with_lowered_flag]=$'\U1F4ED' +emoji[postbox]=$'\U1F4EE' +emoji[postal_horn]=$'\U1F4EF' +emoji[newspaper]=$'\U1F4F0' +emoji[mobile_phone]=$'\U1F4F1' +emoji[mobile_phone_with_rightwards_arrow_at_left]=$'\U1F4F2' +emoji[vibration_mode]=$'\U1F4F3' +emoji[mobile_phone_off]=$'\U1F4F4' +emoji[no_mobile_phones]=$'\U1F4F5' +emoji[antenna_with_bars]=$'\U1F4F6' +emoji[camera]=$'\U1F4F7' +emoji[camera_with_flash]=$'\U1F4F8' +emoji[video_camera]=$'\U1F4F9' +emoji[television]=$'\U1F4FA' +emoji[radio]=$'\U1F4FB' +emoji[videocassette]=$'\U1F4FC' +emoji[film_projector]=$'\U1F4FD' +emoji[prayer_beads]=$'\U1F4FF' +emoji[twisted_rightwards_arrows]=$'\U1F500' +emoji[clockwise_rightwards_and_leftwards_open_circle_arrows]=$'\U1F501' +emoji[clockwise_rightwards_and_leftwards_open_circle_arrows_with_circled_one_overlay]=$'\U1F502' +emoji[clockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F503' +emoji[anticlockwise_downwards_and_upwards_open_circle_arrows]=$'\U1F504' +emoji[low_brightness_symbol]=$'\U1F505' +emoji[high_brightness_symbol]=$'\U1F506' +emoji[speaker_with_cancellation_stroke]=$'\U1F507' +emoji[speaker]=$'\U1F508' +emoji[speaker_with_one_sound_wave]=$'\U1F509' +emoji[speaker_with_three_sound_waves]=$'\U1F50A' +emoji[battery]=$'\U1F50B' +emoji[electric_plug]=$'\U1F50C' +emoji[left_pointing_magnifying_glass]=$'\U1F50D' +emoji[right_pointing_magnifying_glass]=$'\U1F50E' +emoji[lock_with_ink_pen]=$'\U1F50F' +emoji[closed_lock_with_key]=$'\U1F510' +emoji[key]=$'\U1F511' +emoji[lock]=$'\U1F512' +emoji[open_lock]=$'\U1F513' +emoji[bell]=$'\U1F514' +emoji[bell_with_cancellation_stroke]=$'\U1F515' +emoji[bookmark]=$'\U1F516' +emoji[link_symbol]=$'\U1F517' +emoji[radio_button]=$'\U1F518' +emoji[back_with_leftwards_arrow_above]=$'\U1F519' +emoji[end_with_leftwards_arrow_above]=$'\U1F51A' +emoji[on_with_exclamation_mark_with_left_right_arrow_above]=$'\U1F51B' +emoji[soon_with_rightwards_arrow_above]=$'\U1F51C' +emoji[top_with_upwards_arrow_above]=$'\U1F51D' +emoji[no_one_under_eighteen_symbol]=$'\U1F51E' +emoji[keycap_ten]=$'\U1F51F' +emoji[input_symbol_for_latin_capital_letters]=$'\U1F520' +emoji[input_symbol_for_latin_small_letters]=$'\U1F521' +emoji[input_symbol_for_numbers]=$'\U1F522' +emoji[input_symbol_for_symbols]=$'\U1F523' +emoji[input_symbol_for_latin_letters]=$'\U1F524' +emoji[fire]=$'\U1F525' +emoji[electric_torch]=$'\U1F526' +emoji[wrench]=$'\U1F527' +emoji[hammer]=$'\U1F528' +emoji[nut_and_bolt]=$'\U1F529' +emoji[hocho]=$'\U1F52A' +emoji[pistol]=$'\U1F52B' +emoji[microscope]=$'\U1F52C' +emoji[telescope]=$'\U1F52D' +emoji[crystal_ball]=$'\U1F52E' +emoji[six_pointed_star_with_middle_dot]=$'\U1F52F' +emoji[japanese_symbol_for_beginner]=$'\U1F530' +emoji[trident_emblem]=$'\U1F531' +emoji[black_square_button]=$'\U1F532' +emoji[white_square_button]=$'\U1F533' +emoji[large_red_circle]=$'\U1F534' +emoji[large_blue_circle]=$'\U1F535' +emoji[large_orange_diamond]=$'\U1F536' +emoji[large_blue_diamond]=$'\U1F537' +emoji[small_orange_diamond]=$'\U1F538' +emoji[small_blue_diamond]=$'\U1F539' +emoji[up_pointing_red_triangle]=$'\U1F53A' +emoji[down_pointing_red_triangle]=$'\U1F53B' +emoji[up_pointing_small_red_triangle]=$'\U1F53C' +emoji[down_pointing_small_red_triangle]=$'\U1F53D' +emoji[om_symbol]=$'\U1F549' +emoji[dove_of_peace]=$'\U1F54A' +emoji[kaaba]=$'\U1F54B' +emoji[mosque]=$'\U1F54C' +emoji[synagogue]=$'\U1F54D' +emoji[menorah_with_nine_branches]=$'\U1F54E' +emoji[clock_face_one_oclock]=$'\U1F550' +emoji[clock_face_two_oclock]=$'\U1F551' +emoji[clock_face_three_oclock]=$'\U1F552' +emoji[clock_face_four_oclock]=$'\U1F553' +emoji[clock_face_five_oclock]=$'\U1F554' +emoji[clock_face_six_oclock]=$'\U1F555' +emoji[clock_face_seven_oclock]=$'\U1F556' +emoji[clock_face_eight_oclock]=$'\U1F557' +emoji[clock_face_nine_oclock]=$'\U1F558' +emoji[clock_face_ten_oclock]=$'\U1F559' +emoji[clock_face_eleven_oclock]=$'\U1F55A' +emoji[clock_face_twelve_oclock]=$'\U1F55B' +emoji[clock_face_one_thirty]=$'\U1F55C' +emoji[clock_face_two_thirty]=$'\U1F55D' +emoji[clock_face_three_thirty]=$'\U1F55E' +emoji[clock_face_four_thirty]=$'\U1F55F' +emoji[clock_face_five_thirty]=$'\U1F560' +emoji[clock_face_six_thirty]=$'\U1F561' +emoji[clock_face_seven_thirty]=$'\U1F562' +emoji[clock_face_eight_thirty]=$'\U1F563' +emoji[clock_face_nine_thirty]=$'\U1F564' +emoji[clock_face_ten_thirty]=$'\U1F565' +emoji[clock_face_eleven_thirty]=$'\U1F566' +emoji[clock_face_twelve_thirty]=$'\U1F567' +emoji[candle]=$'\U1F56F' +emoji[mantelpiece_clock]=$'\U1F570' +emoji[hole]=$'\U1F573' +emoji[man_in_business_suit_levitating]=$'\U1F574' +emoji[sleuth_or_spy]=$'\U1F575' +emoji[dark_sunglasses]=$'\U1F576' +emoji[spider]=$'\U1F577' +emoji[spider_web]=$'\U1F578' +emoji[joystick]=$'\U1F579' +emoji[linked_paperclips]=$'\U1F587' +emoji[lower_left_ballpoint_pen]=$'\U1F58A' +emoji[lower_left_fountain_pen]=$'\U1F58B' +emoji[lower_left_paintbrush]=$'\U1F58C' +emoji[lower_left_crayon]=$'\U1F58D' +emoji[raised_hand_with_fingers_splayed]=$'\U1F590' +emoji[reversed_hand_with_middle_finger_extended]=$'\U1F595' +emoji[raised_hand_with_part_between_middle_and_ring_fingers]=$'\U1F596' +emoji[desktop_computer]=$'\U1F5A5' +emoji[printer]=$'\U1F5A8' +emoji[three_button_mouse]=$'\U1F5B1' +emoji[trackball]=$'\U1F5B2' +emoji[frame_with_picture]=$'\U1F5BC' +emoji[card_index_dividers]=$'\U1F5C2' +emoji[card_file_box]=$'\U1F5C3' +emoji[file_cabinet]=$'\U1F5C4' +emoji[wastebasket]=$'\U1F5D1' +emoji[spiral_note_pad]=$'\U1F5D2' +emoji[spiral_calendar_pad]=$'\U1F5D3' +emoji[compression]=$'\U1F5DC' +emoji[old_key]=$'\U1F5DD' +emoji[rolled_up_newspaper]=$'\U1F5DE' +emoji[dagger_knife]=$'\U1F5E1' +emoji[speaking_head_in_silhouette]=$'\U1F5E3' +emoji[right_anger_bubble]=$'\U1F5EF' +emoji[ballot_box_with_ballot]=$'\U1F5F3' +emoji[world_map]=$'\U1F5FA' +emoji[mount_fuji]=$'\U1F5FB' +emoji[tokyo_tower]=$'\U1F5FC' +emoji[statue_of_liberty]=$'\U1F5FD' +emoji[silhouette_of_japan]=$'\U1F5FE' +emoji[moyai]=$'\U1F5FF' +emoji[grinning_face]=$'\U1F600' +emoji[grinning_face_with_smiling_eyes]=$'\U1F601' +emoji[face_with_tears_of_joy]=$'\U1F602' +emoji[smiling_face_with_open_mouth]=$'\U1F603' +emoji[smiling_face_with_open_mouth_and_smiling_eyes]=$'\U1F604' +emoji[smiling_face_with_open_mouth_and_cold_sweat]=$'\U1F605' +emoji[smiling_face_with_open_mouth_and_tightly_closed_eyes]=$'\U1F606' +emoji[smiling_face_with_halo]=$'\U1F607' +emoji[smiling_face_with_horns]=$'\U1F608' +emoji[winking_face]=$'\U1F609' +emoji[smiling_face_with_smiling_eyes]=$'\U1F60A' +emoji[face_savouring_delicious_food]=$'\U1F60B' +emoji[relieved_face]=$'\U1F60C' +emoji[smiling_face_with_heart_shaped_eyes]=$'\U1F60D' +emoji[smiling_face_with_sunglasses]=$'\U1F60E' +emoji[smirking_face]=$'\U1F60F' +emoji[neutral_face]=$'\U1F610' +emoji[expressionless_face]=$'\U1F611' +emoji[unamused_face]=$'\U1F612' +emoji[face_with_cold_sweat]=$'\U1F613' +emoji[pensive_face]=$'\U1F614' +emoji[confused_face]=$'\U1F615' +emoji[confounded_face]=$'\U1F616' +emoji[kissing_face]=$'\U1F617' +emoji[face_throwing_a_kiss]=$'\U1F618' +emoji[kissing_face_with_smiling_eyes]=$'\U1F619' +emoji[kissing_face_with_closed_eyes]=$'\U1F61A' +emoji[face_with_stuck_out_tongue]=$'\U1F61B' +emoji[face_with_stuck_out_tongue_and_winking_eye]=$'\U1F61C' +emoji[face_with_stuck_out_tongue_and_tightly_closed_eyes]=$'\U1F61D' +emoji[disappointed_face]=$'\U1F61E' +emoji[worried_face]=$'\U1F61F' +emoji[angry_face]=$'\U1F620' +emoji[pouting_face]=$'\U1F621' +emoji[crying_face]=$'\U1F622' +emoji[persevering_face]=$'\U1F623' +emoji[face_with_look_of_triumph]=$'\U1F624' +emoji[disappointed_but_relieved_face]=$'\U1F625' +emoji[frowning_face_with_open_mouth]=$'\U1F626' +emoji[anguished_face]=$'\U1F627' +emoji[fearful_face]=$'\U1F628' +emoji[weary_face]=$'\U1F629' +emoji[sleepy_face]=$'\U1F62A' +emoji[tired_face]=$'\U1F62B' +emoji[grimacing_face]=$'\U1F62C' +emoji[loudly_crying_face]=$'\U1F62D' +emoji[face_with_open_mouth]=$'\U1F62E' +emoji[hushed_face]=$'\U1F62F' +emoji[face_with_open_mouth_and_cold_sweat]=$'\U1F630' +emoji[face_screaming_in_fear]=$'\U1F631' +emoji[astonished_face]=$'\U1F632' +emoji[flushed_face]=$'\U1F633' +emoji[sleeping_face]=$'\U1F634' +emoji[dizzy_face]=$'\U1F635' +emoji[face_without_mouth]=$'\U1F636' +emoji[face_with_medical_mask]=$'\U1F637' +emoji[grinning_cat_face_with_smiling_eyes]=$'\U1F638' +emoji[cat_face_with_tears_of_joy]=$'\U1F639' +emoji[smiling_cat_face_with_open_mouth]=$'\U1F63A' +emoji[smiling_cat_face_with_heart_shaped_eyes]=$'\U1F63B' +emoji[cat_face_with_wry_smile]=$'\U1F63C' +emoji[kissing_cat_face_with_closed_eyes]=$'\U1F63D' +emoji[pouting_cat_face]=$'\U1F63E' +emoji[crying_cat_face]=$'\U1F63F' +emoji[weary_cat_face]=$'\U1F640' +emoji[slightly_frowning_face]=$'\U1F641' +emoji[slightly_smiling_face]=$'\U1F642' +emoji[upside_down_face]=$'\U1F643' +emoji[face_with_rolling_eyes]=$'\U1F644' +emoji[face_with_no_good_gesture]=$'\U1F645' +emoji[face_with_ok_gesture]=$'\U1F646' +emoji[person_bowing_deeply]=$'\U1F647' +emoji[see_no_evil_monkey]=$'\U1F648' +emoji[hear_no_evil_monkey]=$'\U1F649' +emoji[speak_no_evil_monkey]=$'\U1F64A' +emoji[happy_person_raising_one_hand]=$'\U1F64B' +emoji[person_raising_both_hands_in_celebration]=$'\U1F64C' +emoji[person_frowning]=$'\U1F64D' +emoji[person_with_pouting_face]=$'\U1F64E' +emoji[person_with_folded_hands]=$'\U1F64F' +emoji[rocket]=$'\U1F680' +emoji[helicopter]=$'\U1F681' +emoji[steam_locomotive]=$'\U1F682' +emoji[railway_car]=$'\U1F683' +emoji[high_speed_train]=$'\U1F684' +emoji[high_speed_train_with_bullet_nose]=$'\U1F685' +emoji[train]=$'\U1F686' +emoji[metro]=$'\U1F687' +emoji[light_rail]=$'\U1F688' +emoji[station]=$'\U1F689' +emoji[tram]=$'\U1F68A' +emoji[tram_car]=$'\U1F68B' +emoji[bus]=$'\U1F68C' +emoji[oncoming_bus]=$'\U1F68D' +emoji[trolleybus]=$'\U1F68E' +emoji[bus_stop]=$'\U1F68F' +emoji[minibus]=$'\U1F690' +emoji[ambulance]=$'\U1F691' +emoji[fire_engine]=$'\U1F692' +emoji[police_car]=$'\U1F693' +emoji[oncoming_police_car]=$'\U1F694' +emoji[taxi]=$'\U1F695' +emoji[oncoming_taxi]=$'\U1F696' +emoji[automobile]=$'\U1F697' +emoji[oncoming_automobile]=$'\U1F698' +emoji[recreational_vehicle]=$'\U1F699' +emoji[delivery_truck]=$'\U1F69A' +emoji[articulated_lorry]=$'\U1F69B' +emoji[tractor]=$'\U1F69C' +emoji[monorail]=$'\U1F69D' +emoji[mountain_railway]=$'\U1F69E' +emoji[suspension_railway]=$'\U1F69F' +emoji[mountain_cableway]=$'\U1F6A0' +emoji[aerial_tramway]=$'\U1F6A1' +emoji[ship]=$'\U1F6A2' +emoji[rowboat]=$'\U1F6A3' +emoji[speedboat]=$'\U1F6A4' +emoji[horizontal_traffic_light]=$'\U1F6A5' +emoji[vertical_traffic_light]=$'\U1F6A6' +emoji[construction_sign]=$'\U1F6A7' +emoji[police_cars_revolving_light]=$'\U1F6A8' +emoji[triangular_flag_on_post]=$'\U1F6A9' +emoji[door]=$'\U1F6AA' +emoji[no_entry_sign]=$'\U1F6AB' +emoji[smoking_symbol]=$'\U1F6AC' +emoji[no_smoking_symbol]=$'\U1F6AD' +emoji[put_litter_in_its_place_symbol]=$'\U1F6AE' +emoji[do_not_litter_symbol]=$'\U1F6AF' +emoji[potable_water_symbol]=$'\U1F6B0' +emoji[non_potable_water_symbol]=$'\U1F6B1' +emoji[bicycle]=$'\U1F6B2' +emoji[no_bicycles]=$'\U1F6B3' +emoji[bicyclist]=$'\U1F6B4' +emoji[mountain_bicyclist]=$'\U1F6B5' +emoji[pedestrian]=$'\U1F6B6' +emoji[no_pedestrians]=$'\U1F6B7' +emoji[children_crossing]=$'\U1F6B8' +emoji[mens_symbol]=$'\U1F6B9' +emoji[womens_symbol]=$'\U1F6BA' +emoji[restroom]=$'\U1F6BB' +emoji[baby_symbol]=$'\U1F6BC' +emoji[toilet]=$'\U1F6BD' +emoji[water_closet]=$'\U1F6BE' +emoji[shower]=$'\U1F6BF' +emoji[bath]=$'\U1F6C0' +emoji[bathtub]=$'\U1F6C1' +emoji[passport_control]=$'\U1F6C2' +emoji[customs]=$'\U1F6C3' +emoji[baggage_claim]=$'\U1F6C4' +emoji[left_luggage]=$'\U1F6C5' +emoji[couch_and_lamp]=$'\U1F6CB' +emoji[sleeping_accommodation]=$'\U1F6CC' +emoji[shopping_bags]=$'\U1F6CD' +emoji[bellhop_bell]=$'\U1F6CE' +emoji[bed]=$'\U1F6CF' +emoji[place_of_worship]=$'\U1F6D0' +emoji[hammer_and_wrench]=$'\U1F6E0' +emoji[shield]=$'\U1F6E1' +emoji[oil_drum]=$'\U1F6E2' +emoji[motorway]=$'\U1F6E3' +emoji[railway_track]=$'\U1F6E4' +emoji[motor_boat]=$'\U1F6E5' +emoji[small_airplane]=$'\U1F6E9' +emoji[airplane_departure]=$'\U1F6EB' +emoji[airplane_arriving]=$'\U1F6EC' +emoji[satellite]=$'\U1F6F0' +emoji[passenger_ship]=$'\U1F6F3' +emoji[zipper_mouth_face]=$'\U1F910' +emoji[money_mouth_face]=$'\U1F911' +emoji[face_with_thermometer]=$'\U1F912' +emoji[nerd_face]=$'\U1F913' +emoji[thinking_face]=$'\U1F914' +emoji[face_with_head_bandage]=$'\U1F915' +emoji[robot_face]=$'\U1F916' +emoji[hugging_face]=$'\U1F917' +emoji[sign_of_the_horns]=$'\U1F918' +emoji[crab]=$'\U1F980' +emoji[lion_face]=$'\U1F981' +emoji[scorpion]=$'\U1F982' +emoji[turkey]=$'\U1F983' +emoji[unicorn_face]=$'\U1F984' +emoji[cheese_wedge]=$'\U1F9C0' +emoji[keycap_number_sign]=$'\U0023\U20E3' +emoji[keycap_asterisk]=$'\U002A\U20E3' +emoji[keycap_digit_zero]=$'\U0030\U20E3' +emoji[keycap_digit_one]=$'\U0031\U20E3' +emoji[keycap_digit_two]=$'\U0032\U20E3' +emoji[keycap_digit_three]=$'\U0033\U20E3' +emoji[keycap_digit_four]=$'\U0034\U20E3' +emoji[keycap_digit_five]=$'\U0035\U20E3' +emoji[keycap_digit_six]=$'\U0036\U20E3' +emoji[keycap_digit_seven]=$'\U0037\U20E3' +emoji[keycap_digit_eight]=$'\U0038\U20E3' +emoji[keycap_digit_nine]=$'\U0039\U20E3' +emoji_flags[Ascension_Island]=$'\U1F1E6\U1F1E8' +emoji_flags[Andorra]=$'\U1F1E6\U1F1E9' +emoji_flags[United_Arab_Emirates]=$'\U1F1E6\U1F1EA' +emoji_flags[Afghanistan]=$'\U1F1E6\U1F1EB' +emoji_flags[Antigua___Barbuda]=$'\U1F1E6\U1F1EC' +emoji_flags[Anguilla]=$'\U1F1E6\U1F1EE' +emoji_flags[Albania]=$'\U1F1E6\U1F1F1' +emoji_flags[Armenia]=$'\U1F1E6\U1F1F2' +emoji_flags[Angola]=$'\U1F1E6\U1F1F4' +emoji_flags[Antarctica]=$'\U1F1E6\U1F1F6' +emoji_flags[Argentina]=$'\U1F1E6\U1F1F7' +emoji_flags[American_Samoa]=$'\U1F1E6\U1F1F8' +emoji_flags[Austria]=$'\U1F1E6\U1F1F9' +emoji_flags[Australia]=$'\U1F1E6\U1F1FA' +emoji_flags[Aruba]=$'\U1F1E6\U1F1FC' +emoji_flags[_land_Islands]=$'\U1F1E6\U1F1FD' +emoji_flags[Azerbaijan]=$'\U1F1E6\U1F1FF' +emoji_flags[Bosnia___Herzegovina]=$'\U1F1E7\U1F1E6' +emoji_flags[Barbados]=$'\U1F1E7\U1F1E7' +emoji_flags[Bangladesh]=$'\U1F1E7\U1F1E9' +emoji_flags[Belgium]=$'\U1F1E7\U1F1EA' +emoji_flags[Burkina_Faso]=$'\U1F1E7\U1F1EB' +emoji_flags[Bulgaria]=$'\U1F1E7\U1F1EC' +emoji_flags[Bahrain]=$'\U1F1E7\U1F1ED' +emoji_flags[Burundi]=$'\U1F1E7\U1F1EE' +emoji_flags[Benin]=$'\U1F1E7\U1F1EF' +emoji_flags[St__Barth_lemy]=$'\U1F1E7\U1F1F1' +emoji_flags[Bermuda]=$'\U1F1E7\U1F1F2' +emoji_flags[Brunei]=$'\U1F1E7\U1F1F3' +emoji_flags[Bolivia]=$'\U1F1E7\U1F1F4' +emoji_flags[Caribbean_Netherlands]=$'\U1F1E7\U1F1F6' +emoji_flags[Brazil]=$'\U1F1E7\U1F1F7' +emoji_flags[Bahamas]=$'\U1F1E7\U1F1F8' +emoji_flags[Bhutan]=$'\U1F1E7\U1F1F9' +emoji_flags[Bouvet_Island]=$'\U1F1E7\U1F1FB' +emoji_flags[Botswana]=$'\U1F1E7\U1F1FC' +emoji_flags[Belarus]=$'\U1F1E7\U1F1FE' +emoji_flags[Belize]=$'\U1F1E7\U1F1FF' +emoji_flags[Canada]=$'\U1F1E8\U1F1E6' +emoji_flags[Cocos__Islands]=$'\U1F1E8\U1F1E8' +emoji_flags[Congo___Kinshasa]=$'\U1F1E8\U1F1E9' +emoji_flags[Central_African_Republic]=$'\U1F1E8\U1F1EB' +emoji_flags[Congo___Brazzaville]=$'\U1F1E8\U1F1EC' +emoji_flags[Switzerland]=$'\U1F1E8\U1F1ED' +emoji_flags[C_te_d__Ivoire]=$'\U1F1E8\U1F1EE' +emoji_flags[Cook_Islands]=$'\U1F1E8\U1F1F0' +emoji_flags[Chile]=$'\U1F1E8\U1F1F1' +emoji_flags[Cameroon]=$'\U1F1E8\U1F1F2' +emoji_flags[China]=$'\U1F1E8\U1F1F3' +emoji_flags[Colombia]=$'\U1F1E8\U1F1F4' +emoji_flags[Clipperton_Island]=$'\U1F1E8\U1F1F5' +emoji_flags[Costa_Rica]=$'\U1F1E8\U1F1F7' +emoji_flags[Cuba]=$'\U1F1E8\U1F1FA' +emoji_flags[Cape_Verde]=$'\U1F1E8\U1F1FB' +emoji_flags[Cura_ao]=$'\U1F1E8\U1F1FC' +emoji_flags[Christmas_Island]=$'\U1F1E8\U1F1FD' +emoji_flags[Cyprus]=$'\U1F1E8\U1F1FE' +emoji_flags[Czech_Republic]=$'\U1F1E8\U1F1FF' +emoji_flags[Germany]=$'\U1F1E9\U1F1EA' +emoji_flags[Diego_Garcia]=$'\U1F1E9\U1F1EC' +emoji_flags[Djibouti]=$'\U1F1E9\U1F1EF' +emoji_flags[Denmark]=$'\U1F1E9\U1F1F0' +emoji_flags[Dominica]=$'\U1F1E9\U1F1F2' +emoji_flags[Dominican_Republic]=$'\U1F1E9\U1F1F4' +emoji_flags[Algeria]=$'\U1F1E9\U1F1FF' +emoji_flags[Ceuta___Melilla]=$'\U1F1EA\U1F1E6' +emoji_flags[Ecuador]=$'\U1F1EA\U1F1E8' +emoji_flags[Estonia]=$'\U1F1EA\U1F1EA' +emoji_flags[Egypt]=$'\U1F1EA\U1F1EC' +emoji_flags[Western_Sahara]=$'\U1F1EA\U1F1ED' +emoji_flags[Eritrea]=$'\U1F1EA\U1F1F7' +emoji_flags[Spain]=$'\U1F1EA\U1F1F8' +emoji_flags[Ethiopia]=$'\U1F1EA\U1F1F9' +emoji_flags[European_Union]=$'\U1F1EA\U1F1FA' +emoji_flags[Finland]=$'\U1F1EB\U1F1EE' +emoji_flags[Fiji]=$'\U1F1EB\U1F1EF' +emoji_flags[Falkland_Islands]=$'\U1F1EB\U1F1F0' +emoji_flags[Micronesia]=$'\U1F1EB\U1F1F2' +emoji_flags[Faroe_Islands]=$'\U1F1EB\U1F1F4' +emoji_flags[France]=$'\U1F1EB\U1F1F7' +emoji_flags[Gabon]=$'\U1F1EC\U1F1E6' +emoji_flags[United_Kingdom]=$'\U1F1EC\U1F1E7' +emoji_flags[Grenada]=$'\U1F1EC\U1F1E9' +emoji_flags[Georgia]=$'\U1F1EC\U1F1EA' +emoji_flags[French_Guiana]=$'\U1F1EC\U1F1EB' +emoji_flags[Guernsey]=$'\U1F1EC\U1F1EC' +emoji_flags[Ghana]=$'\U1F1EC\U1F1ED' +emoji_flags[Gibraltar]=$'\U1F1EC\U1F1EE' +emoji_flags[Greenland]=$'\U1F1EC\U1F1F1' +emoji_flags[Gambia]=$'\U1F1EC\U1F1F2' +emoji_flags[Guinea]=$'\U1F1EC\U1F1F3' +emoji_flags[Guadeloupe]=$'\U1F1EC\U1F1F5' +emoji_flags[Equatorial_Guinea]=$'\U1F1EC\U1F1F6' +emoji_flags[Greece]=$'\U1F1EC\U1F1F7' +emoji_flags[South_Georgia___South_Sandwich_Islands]=$'\U1F1EC\U1F1F8' +emoji_flags[Guatemala]=$'\U1F1EC\U1F1F9' +emoji_flags[Guam]=$'\U1F1EC\U1F1FA' +emoji_flags[Guinea_Bissau]=$'\U1F1EC\U1F1FC' +emoji_flags[Guyana]=$'\U1F1EC\U1F1FE' +emoji_flags[Hong_Kong]=$'\U1F1ED\U1F1F0' +emoji_flags[Heard___McDonald_Islands]=$'\U1F1ED\U1F1F2' +emoji_flags[Honduras]=$'\U1F1ED\U1F1F3' +emoji_flags[Croatia]=$'\U1F1ED\U1F1F7' +emoji_flags[Haiti]=$'\U1F1ED\U1F1F9' +emoji_flags[Hungary]=$'\U1F1ED\U1F1FA' +emoji_flags[Canary_Islands]=$'\U1F1EE\U1F1E8' +emoji_flags[Indonesia]=$'\U1F1EE\U1F1E9' +emoji_flags[Ireland]=$'\U1F1EE\U1F1EA' +emoji_flags[Israel]=$'\U1F1EE\U1F1F1' +emoji_flags[Isle_of_Man]=$'\U1F1EE\U1F1F2' +emoji_flags[India]=$'\U1F1EE\U1F1F3' +emoji_flags[British_Indian_Ocean_Territory]=$'\U1F1EE\U1F1F4' +emoji_flags[Iraq]=$'\U1F1EE\U1F1F6' +emoji_flags[Iran]=$'\U1F1EE\U1F1F7' +emoji_flags[Iceland]=$'\U1F1EE\U1F1F8' +emoji_flags[Italy]=$'\U1F1EE\U1F1F9' +emoji_flags[Jersey]=$'\U1F1EF\U1F1EA' +emoji_flags[Jamaica]=$'\U1F1EF\U1F1F2' +emoji_flags[Jordan]=$'\U1F1EF\U1F1F4' +emoji_flags[Japan]=$'\U1F1EF\U1F1F5' +emoji_flags[Kenya]=$'\U1F1F0\U1F1EA' +emoji_flags[Kyrgyzstan]=$'\U1F1F0\U1F1EC' +emoji_flags[Cambodia]=$'\U1F1F0\U1F1ED' +emoji_flags[Kiribati]=$'\U1F1F0\U1F1EE' +emoji_flags[Comoros]=$'\U1F1F0\U1F1F2' +emoji_flags[St__Kitts___Nevis]=$'\U1F1F0\U1F1F3' +emoji_flags[North_Korea]=$'\U1F1F0\U1F1F5' +emoji_flags[South_Korea]=$'\U1F1F0\U1F1F7' +emoji_flags[Kuwait]=$'\U1F1F0\U1F1FC' +emoji_flags[Cayman_Islands]=$'\U1F1F0\U1F1FE' +emoji_flags[Kazakhstan]=$'\U1F1F0\U1F1FF' +emoji_flags[Laos]=$'\U1F1F1\U1F1E6' +emoji_flags[Lebanon]=$'\U1F1F1\U1F1E7' +emoji_flags[St__Lucia]=$'\U1F1F1\U1F1E8' +emoji_flags[Liechtenstein]=$'\U1F1F1\U1F1EE' +emoji_flags[Sri_Lanka]=$'\U1F1F1\U1F1F0' +emoji_flags[Liberia]=$'\U1F1F1\U1F1F7' +emoji_flags[Lesotho]=$'\U1F1F1\U1F1F8' +emoji_flags[Lithuania]=$'\U1F1F1\U1F1F9' +emoji_flags[Luxembourg]=$'\U1F1F1\U1F1FA' +emoji_flags[Latvia]=$'\U1F1F1\U1F1FB' +emoji_flags[Libya]=$'\U1F1F1\U1F1FE' +emoji_flags[Morocco]=$'\U1F1F2\U1F1E6' +emoji_flags[Monaco]=$'\U1F1F2\U1F1E8' +emoji_flags[Moldova]=$'\U1F1F2\U1F1E9' +emoji_flags[Montenegro]=$'\U1F1F2\U1F1EA' +emoji_flags[St__Martin]=$'\U1F1F2\U1F1EB' +emoji_flags[Madagascar]=$'\U1F1F2\U1F1EC' +emoji_flags[Marshall_Islands]=$'\U1F1F2\U1F1ED' +emoji_flags[Macedonia]=$'\U1F1F2\U1F1F0' +emoji_flags[Mali]=$'\U1F1F2\U1F1F1' +emoji_flags[Myanmar]=$'\U1F1F2\U1F1F2' +emoji_flags[Mongolia]=$'\U1F1F2\U1F1F3' +emoji_flags[Macau]=$'\U1F1F2\U1F1F4' +emoji_flags[Northern_Mariana_Islands]=$'\U1F1F2\U1F1F5' +emoji_flags[Martinique]=$'\U1F1F2\U1F1F6' +emoji_flags[Mauritania]=$'\U1F1F2\U1F1F7' +emoji_flags[Montserrat]=$'\U1F1F2\U1F1F8' +emoji_flags[Malta]=$'\U1F1F2\U1F1F9' +emoji_flags[Mauritius]=$'\U1F1F2\U1F1FA' +emoji_flags[Maldives]=$'\U1F1F2\U1F1FB' +emoji_flags[Malawi]=$'\U1F1F2\U1F1FC' +emoji_flags[Mexico]=$'\U1F1F2\U1F1FD' +emoji_flags[Malaysia]=$'\U1F1F2\U1F1FE' +emoji_flags[Mozambique]=$'\U1F1F2\U1F1FF' +emoji_flags[Namibia]=$'\U1F1F3\U1F1E6' +emoji_flags[New_Caledonia]=$'\U1F1F3\U1F1E8' +emoji_flags[Niger]=$'\U1F1F3\U1F1EA' +emoji_flags[Norfolk_Island]=$'\U1F1F3\U1F1EB' +emoji_flags[Nigeria]=$'\U1F1F3\U1F1EC' +emoji_flags[Nicaragua]=$'\U1F1F3\U1F1EE' +emoji_flags[Netherlands]=$'\U1F1F3\U1F1F1' +emoji_flags[Norway]=$'\U1F1F3\U1F1F4' +emoji_flags[Nepal]=$'\U1F1F3\U1F1F5' +emoji_flags[Nauru]=$'\U1F1F3\U1F1F7' +emoji_flags[Niue]=$'\U1F1F3\U1F1FA' +emoji_flags[New_Zealand]=$'\U1F1F3\U1F1FF' +emoji_flags[Oman]=$'\U1F1F4\U1F1F2' +emoji_flags[Panama]=$'\U1F1F5\U1F1E6' +emoji_flags[Peru]=$'\U1F1F5\U1F1EA' +emoji_flags[French_Polynesia]=$'\U1F1F5\U1F1EB' +emoji_flags[Papua_New_Guinea]=$'\U1F1F5\U1F1EC' +emoji_flags[Philippines]=$'\U1F1F5\U1F1ED' +emoji_flags[Pakistan]=$'\U1F1F5\U1F1F0' +emoji_flags[Poland]=$'\U1F1F5\U1F1F1' +emoji_flags[St__Pierre___Miquelon]=$'\U1F1F5\U1F1F2' +emoji_flags[Pitcairn_Islands]=$'\U1F1F5\U1F1F3' +emoji_flags[Puerto_Rico]=$'\U1F1F5\U1F1F7' +emoji_flags[Palestinian_Territories]=$'\U1F1F5\U1F1F8' +emoji_flags[Portugal]=$'\U1F1F5\U1F1F9' +emoji_flags[Palau]=$'\U1F1F5\U1F1FC' +emoji_flags[Paraguay]=$'\U1F1F5\U1F1FE' +emoji_flags[Qatar]=$'\U1F1F6\U1F1E6' +emoji_flags[R_union]=$'\U1F1F7\U1F1EA' +emoji_flags[Romania]=$'\U1F1F7\U1F1F4' +emoji_flags[Serbia]=$'\U1F1F7\U1F1F8' +emoji_flags[Russia]=$'\U1F1F7\U1F1FA' +emoji_flags[Rwanda]=$'\U1F1F7\U1F1FC' +emoji_flags[Saudi_Arabia]=$'\U1F1F8\U1F1E6' +emoji_flags[Solomon_Islands]=$'\U1F1F8\U1F1E7' +emoji_flags[Seychelles]=$'\U1F1F8\U1F1E8' +emoji_flags[Sudan]=$'\U1F1F8\U1F1E9' +emoji_flags[Sweden]=$'\U1F1F8\U1F1EA' +emoji_flags[Singapore]=$'\U1F1F8\U1F1EC' +emoji_flags[St__Helena]=$'\U1F1F8\U1F1ED' +emoji_flags[Slovenia]=$'\U1F1F8\U1F1EE' +emoji_flags[Svalbard___Jan_Mayen]=$'\U1F1F8\U1F1EF' +emoji_flags[Slovakia]=$'\U1F1F8\U1F1F0' +emoji_flags[Sierra_Leone]=$'\U1F1F8\U1F1F1' +emoji_flags[San_Marino]=$'\U1F1F8\U1F1F2' +emoji_flags[Senegal]=$'\U1F1F8\U1F1F3' +emoji_flags[Somalia]=$'\U1F1F8\U1F1F4' +emoji_flags[Suriname]=$'\U1F1F8\U1F1F7' +emoji_flags[South_Sudan]=$'\U1F1F8\U1F1F8' +emoji_flags[S_o_Tom____Pr_ncipe]=$'\U1F1F8\U1F1F9' +emoji_flags[El_Salvador]=$'\U1F1F8\U1F1FB' +emoji_flags[Sint_Maarten]=$'\U1F1F8\U1F1FD' +emoji_flags[Syria]=$'\U1F1F8\U1F1FE' +emoji_flags[Swaziland]=$'\U1F1F8\U1F1FF' +emoji_flags[Tristan_da_Cunha]=$'\U1F1F9\U1F1E6' +emoji_flags[Turks___Caicos_Islands]=$'\U1F1F9\U1F1E8' +emoji_flags[Chad]=$'\U1F1F9\U1F1E9' +emoji_flags[French_Southern_Territories]=$'\U1F1F9\U1F1EB' +emoji_flags[Togo]=$'\U1F1F9\U1F1EC' +emoji_flags[Thailand]=$'\U1F1F9\U1F1ED' +emoji_flags[Tajikistan]=$'\U1F1F9\U1F1EF' +emoji_flags[Tokelau]=$'\U1F1F9\U1F1F0' +emoji_flags[Timor_Leste]=$'\U1F1F9\U1F1F1' +emoji_flags[Turkmenistan]=$'\U1F1F9\U1F1F2' +emoji_flags[Tunisia]=$'\U1F1F9\U1F1F3' +emoji_flags[Tonga]=$'\U1F1F9\U1F1F4' +emoji_flags[Turkey]=$'\U1F1F9\U1F1F7' +emoji_flags[Trinidad___Tobago]=$'\U1F1F9\U1F1F9' +emoji_flags[Tuvalu]=$'\U1F1F9\U1F1FB' +emoji_flags[Taiwan]=$'\U1F1F9\U1F1FC' +emoji_flags[Tanzania]=$'\U1F1F9\U1F1FF' +emoji_flags[Ukraine]=$'\U1F1FA\U1F1E6' +emoji_flags[Uganda]=$'\U1F1FA\U1F1EC' +emoji_flags[U_S__Outlying_Islands]=$'\U1F1FA\U1F1F2' +emoji_flags[United_States]=$'\U1F1FA\U1F1F8' +emoji_flags[Uruguay]=$'\U1F1FA\U1F1FE' +emoji_flags[Uzbekistan]=$'\U1F1FA\U1F1FF' +emoji_flags[Vatican_City]=$'\U1F1FB\U1F1E6' +emoji_flags[St__Vincent___Grenadines]=$'\U1F1FB\U1F1E8' +emoji_flags[Venezuela]=$'\U1F1FB\U1F1EA' +emoji_flags[British_Virgin_Islands]=$'\U1F1FB\U1F1EC' +emoji_flags[U_S__Virgin_Islands]=$'\U1F1FB\U1F1EE' +emoji_flags[Vietnam]=$'\U1F1FB\U1F1F3' +emoji_flags[Vanuatu]=$'\U1F1FB\U1F1FA' +emoji_flags[Wallis___Futuna]=$'\U1F1FC\U1F1EB' +emoji_flags[Samoa]=$'\U1F1FC\U1F1F8' +emoji_flags[Kosovo]=$'\U1F1FD\U1F1F0' +emoji_flags[Yemen]=$'\U1F1FE\U1F1EA' +emoji_flags[Mayotte]=$'\U1F1FE\U1F1F9' +emoji_flags[South_Africa]=$'\U1F1FF\U1F1E6' +emoji_flags[Zambia]=$'\U1F1FF\U1F1F2' +emoji_flags[Zimbabwe]=$'\U1F1FF\U1F1FC' + diff --git a/plugins/emoji/emoji-data.txt b/plugins/emoji/emoji-data.txt new file mode 100644 index 000000000..7b4c015f7 --- /dev/null +++ b/plugins/emoji/emoji-data.txt @@ -0,0 +1,1308 @@ +# DRAFT emoji-data.txt +# For details about the format and other information, see /../../../reports/tr51/index.html#Data_Files. +# +# Format: Code ; Default_Emoji_Style ; Emoji_Level ; Emoji_Modifier_Status ; Emoji_Sources # Comment +# +# Field 1 — Default_Emoji_Style: +# text: default text presentation +# emoji: default emoji presentation +# Field 2 — Emoji_Level: +# L1: level 1 emoji +# L2: level 2 emoji +# NA: not applicable +# Field 3 — Emoji_Modifier_Status: +# modifier: an emoji modifier +# primary: a primary emoji modifier base +# secondary: a secondary emoji modifier base +# none: not applicable +# Field 4 — Emoji_Sources: +# one or more values from {z, a, j, w, x} +# see the key in http://www.unicode.org/draft/reports/tr51/tr51.html#Major_Sources +# NA: not applicable +# Comment — currently contains the version where the character was first encoded, +# followed by: +# - a character name in uppercase (for a single character), +# - a keycap name, +# - an associated flag, where is associated with value unicode region code +# +00A9 ; text ; L1 ; none ; j # V1.1 (©) COPYRIGHT SIGN +00AE ; text ; L1 ; none ; j # V1.1 (®) REGISTERED SIGN +203C ; text ; L1 ; none ; a j # V1.1 (‼) DOUBLE EXCLAMATION MARK +2049 ; text ; L1 ; none ; a j # V3.0 (⁉) EXCLAMATION QUESTION MARK +2122 ; text ; L1 ; none ; j # V1.1 (™) TRADE MARK SIGN +2139 ; text ; L1 ; none ; j # V3.0 (ℹ) INFORMATION SOURCE +2194 ; text ; L1 ; none ; z j # V1.1 (↔) LEFT RIGHT ARROW +2195 ; text ; L1 ; none ; z j # V1.1 (↕) UP DOWN ARROW +2196 ; text ; L1 ; none ; j # V1.1 (↖) NORTH WEST ARROW +2197 ; text ; L1 ; none ; j # V1.1 (↗) NORTH EAST ARROW +2198 ; text ; L1 ; none ; j # V1.1 (↘) SOUTH EAST ARROW +2199 ; text ; L1 ; none ; j # V1.1 (↙) SOUTH WEST ARROW +21A9 ; text ; L1 ; none ; j # V1.1 (↩) LEFTWARDS ARROW WITH HOOK +21AA ; text ; L1 ; none ; j # V1.1 (↪) RIGHTWARDS ARROW WITH HOOK +231A ; emoji ; L1 ; none ; j # V1.1 (⌚) WATCH +231B ; emoji ; L1 ; none ; j # V1.1 (⌛) HOURGLASS +2328 ; text ; L2 ; none ; x # V1.1 (⌨) KEYBOARD +23CF ; text ; L2 ; none ; x # V4.0 (⏏) EJECT SYMBOL +23E9 ; emoji ; L1 ; none ; j w # V6.0 (⏩) BLACK RIGHT-POINTING DOUBLE TRIANGLE +23EA ; emoji ; L1 ; none ; j w # V6.0 (⏪) BLACK LEFT-POINTING DOUBLE TRIANGLE +23EB ; emoji ; L1 ; none ; j # V6.0 (⏫) BLACK UP-POINTING DOUBLE TRIANGLE +23EC ; emoji ; L1 ; none ; j # V6.0 (⏬) BLACK DOWN-POINTING DOUBLE TRIANGLE +23ED ; text ; L2 ; none ; w # V6.0 (⏭) BLACK RIGHT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR +23EE ; text ; L2 ; none ; w # V6.0 (⏮) BLACK LEFT-POINTING DOUBLE TRIANGLE WITH VERTICAL BAR +23EF ; text ; L2 ; none ; x # V6.0 (⏯) BLACK RIGHT-POINTING TRIANGLE WITH DOUBLE VERTICAL BAR +23F0 ; emoji ; L1 ; none ; j # V6.0 (⏰) ALARM CLOCK +23F1 ; text ; L2 ; none ; x # V6.0 (⏱) STOPWATCH +23F2 ; text ; L2 ; none ; x # V6.0 (⏲) TIMER CLOCK +23F3 ; emoji ; L1 ; none ; j w # V6.0 (⏳) HOURGLASS WITH FLOWING SAND +23F8 ; text ; L2 ; none ; w # V7.0 (⏸) DOUBLE VERTICAL BAR +23F9 ; text ; L2 ; none ; w # V7.0 (⏹) BLACK SQUARE FOR STOP +23FA ; text ; L2 ; none ; w # V7.0 (⏺) BLACK CIRCLE FOR RECORD +24C2 ; text ; L1 ; none ; j # V1.1 (Ⓜ) CIRCLED LATIN CAPITAL LETTER M +25AA ; text ; L1 ; none ; j w # V1.1 (▪) BLACK SMALL SQUARE +25AB ; text ; L1 ; none ; j # V1.1 (▫) WHITE SMALL SQUARE +25B6 ; text ; L1 ; none ; a j w # V1.1 (▶) BLACK RIGHT-POINTING TRIANGLE +25C0 ; text ; L1 ; none ; a j w # V1.1 (◀) BLACK LEFT-POINTING TRIANGLE +25FB ; text ; L1 ; none ; j # V3.2 (◻) WHITE MEDIUM SQUARE +25FC ; text ; L1 ; none ; j w # V3.2 (◼) BLACK MEDIUM SQUARE +25FD ; emoji ; L1 ; none ; j # V3.2 (◽) WHITE MEDIUM SMALL SQUARE +25FE ; emoji ; L1 ; none ; j w # V3.2 (◾) BLACK MEDIUM SMALL SQUARE +2600 ; text ; L1 ; none ; a j # V1.1 (☀) BLACK SUN WITH RAYS +2601 ; text ; L1 ; none ; a j w # V1.1 (☁) CLOUD +2602 ; text ; L2 ; none ; a # V1.1 (☂) UMBRELLA +2603 ; text ; L2 ; none ; a # V1.1 (☃) SNOWMAN +2604 ; text ; L2 ; none ; x # V1.1 (☄) COMET +260E ; text ; L1 ; none ; z a j # V1.1 (☎) BLACK TELEPHONE +2611 ; text ; L1 ; none ; j w # V1.1 (☑) BALLOT BOX WITH CHECK +2614 ; emoji ; L1 ; none ; a j # V4.0 (☔) UMBRELLA WITH RAIN DROPS +2615 ; emoji ; L1 ; none ; j # V4.0 (☕) HOT BEVERAGE +2618 ; text ; L2 ; none ; x # V4.1 (☘) SHAMROCK +261D ; text ; L1 ; secondary ; j w # V1.1 (☝) WHITE UP POINTING INDEX +2620 ; text ; L2 ; none ; x # V1.1 (☠) SKULL AND CROSSBONES +2622 ; text ; L2 ; none ; x # V1.1 (☢) RADIOACTIVE SIGN +2623 ; text ; L2 ; none ; x # V1.1 (☣) BIOHAZARD SIGN +2626 ; text ; L2 ; none ; x # V1.1 (☦) ORTHODOX CROSS +262A ; text ; L2 ; none ; w # V1.1 (☪) STAR AND CRESCENT +262E ; text ; L2 ; none ; x # V1.1 (☮) PEACE SYMBOL +262F ; text ; L2 ; none ; w # V1.1 (☯) YIN YANG +2638 ; text ; L2 ; none ; w # V1.1 (☸) WHEEL OF DHARMA +2639 ; text ; L2 ; secondary ; w # V1.1 (☹) WHITE FROWNING FACE +263A ; text ; L1 ; secondary ; j w # V1.1 (☺) WHITE SMILING FACE +2648 ; emoji ; L1 ; none ; j w # V1.1 (♈) ARIES +2649 ; emoji ; L1 ; none ; j w # V1.1 (♉) TAURUS +264A ; emoji ; L1 ; none ; j w # V1.1 (♊) GEMINI +264B ; emoji ; L1 ; none ; j w # V1.1 (♋) CANCER +264C ; emoji ; L1 ; none ; j w # V1.1 (♌) LEO +264D ; emoji ; L1 ; none ; j w # V1.1 (♍) VIRGO +264E ; emoji ; L1 ; none ; j w # V1.1 (♎) LIBRA +264F ; emoji ; L1 ; none ; j w # V1.1 (♏) SCORPIUS +2650 ; emoji ; L1 ; none ; j w # V1.1 (♐) SAGITTARIUS +2651 ; emoji ; L1 ; none ; j w # V1.1 (♑) CAPRICORN +2652 ; emoji ; L1 ; none ; j w # V1.1 (♒) AQUARIUS +2653 ; emoji ; L1 ; none ; j w # V1.1 (♓) PISCES +2660 ; text ; L1 ; none ; z a j # V1.1 (♠) BLACK SPADE SUIT +2663 ; text ; L1 ; none ; z a j # V1.1 (♣) BLACK CLUB SUIT +2665 ; text ; L1 ; none ; z a j # V1.1 (♥) BLACK HEART SUIT +2666 ; text ; L1 ; none ; z a j # V1.1 (♦) BLACK DIAMOND SUIT +2668 ; text ; L1 ; none ; a j # V1.1 (♨) HOT SPRINGS +267B ; text ; L1 ; none ; j # V3.2 (♻) BLACK UNIVERSAL RECYCLING SYMBOL +267F ; emoji ; L1 ; none ; j w # V4.1 (♿) WHEELCHAIR SYMBOL +2692 ; text ; L2 ; none ; x # V4.1 (⚒) HAMMER AND PICK +2693 ; emoji ; L1 ; none ; a j # V4.1 (⚓) ANCHOR +2694 ; text ; L2 ; none ; x # V4.1 (⚔) CROSSED SWORDS +2696 ; text ; L2 ; none ; x # V4.1 (⚖) SCALES +2697 ; text ; L2 ; none ; x # V4.1 (⚗) ALEMBIC +2699 ; text ; L2 ; none ; x # V4.1 (⚙) GEAR +269B ; text ; L2 ; none ; x # V4.1 (⚛) ATOM SYMBOL +269C ; text ; L2 ; none ; x # V4.1 (⚜) FLEUR-DE-LIS +26A0 ; text ; L1 ; none ; j # V4.0 (⚠) WARNING SIGN +26A1 ; emoji ; L1 ; none ; a j # V4.0 (⚡) HIGH VOLTAGE SIGN +26AA ; emoji ; L1 ; none ; j # V4.1 (⚪) MEDIUM WHITE CIRCLE +26AB ; emoji ; L1 ; none ; j w # V4.1 (⚫) MEDIUM BLACK CIRCLE +26B0 ; text ; L2 ; none ; x # V4.1 (⚰) COFFIN +26B1 ; text ; L2 ; none ; x # V4.1 (⚱) FUNERAL URN +26BD ; emoji ; L1 ; none ; j # V5.2 (⚽) SOCCER BALL +26BE ; emoji ; L1 ; none ; a j # V5.2 (⚾) BASEBALL +26C4 ; emoji ; L1 ; none ; a j # V5.2 (⛄) SNOWMAN WITHOUT SNOW +26C5 ; emoji ; L1 ; none ; a j # V5.2 (⛅) SUN BEHIND CLOUD +26C8 ; text ; L2 ; none ; a # V5.2 (⛈) THUNDER CLOUD AND RAIN +26CE ; emoji ; L1 ; none ; a j # V6.0 (⛎) OPHIUCHUS +26CF ; text ; L2 ; none ; a # V5.2 (⛏) PICK +26D1 ; text ; L2 ; none ; a # V5.2 (⛑) HELMET WITH WHITE CROSS +26D3 ; text ; L2 ; none ; a # V5.2 (⛓) CHAINS +26D4 ; emoji ; L1 ; none ; a j # V5.2 (⛔) NO ENTRY +26E9 ; text ; L2 ; none ; a # V5.2 (⛩) SHINTO SHRINE +26EA ; emoji ; L1 ; none ; a j # V5.2 (⛪) CHURCH +26F0 ; text ; L2 ; none ; a # V5.2 (⛰) MOUNTAIN +26F1 ; text ; L2 ; none ; a # V5.2 (⛱) UMBRELLA ON GROUND +26F2 ; emoji ; L1 ; none ; a j # V5.2 (⛲) FOUNTAIN +26F3 ; emoji ; L1 ; none ; a j w # V5.2 (⛳) FLAG IN HOLE +26F4 ; text ; L2 ; none ; a # V5.2 (⛴) FERRY +26F5 ; emoji ; L1 ; none ; a j # V5.2 (⛵) SAILBOAT +26F7 ; text ; L2 ; none ; a w # V5.2 (⛷) SKIER +26F8 ; text ; L2 ; none ; a # V5.2 (⛸) ICE SKATE +26F9 ; text ; L2 ; none ; a # V5.2 (⛹) PERSON WITH BALL +26FA ; emoji ; L1 ; none ; a j # V5.2 (⛺) TENT +26FD ; emoji ; L1 ; none ; a j # V5.2 (⛽) FUEL PUMP +2702 ; text ; L1 ; none ; z j w # V1.1 (✂) BLACK SCISSORS +2705 ; emoji ; L1 ; none ; j # V6.0 (✅) WHITE HEAVY CHECK MARK +2708 ; text ; L1 ; none ; z a j w # V1.1 (✈) AIRPLANE +2709 ; text ; L1 ; none ; z j # V1.1 (✉) ENVELOPE +270A ; emoji ; L1 ; secondary ; j # V6.0 (✊) RAISED FIST +270B ; emoji ; L1 ; secondary ; j # V6.0 (✋) RAISED HAND +270C ; text ; L1 ; secondary ; z j w # V1.1 (✌) VICTORY HAND +270D ; text ; L2 ; secondary ; z w # V1.1 (✍) WRITING HAND +270F ; text ; L1 ; none ; z j # V1.1 (✏) PENCIL +2712 ; text ; L1 ; none ; z j # V1.1 (✒) BLACK NIB +2714 ; text ; L1 ; none ; z j w # V1.1 (✔) HEAVY CHECK MARK +2716 ; text ; L1 ; none ; z j # V1.1 (✖) HEAVY MULTIPLICATION X +271D ; text ; L2 ; none ; w # V1.1 (✝) LATIN CROSS +2721 ; text ; L2 ; none ; w # V1.1 (✡) STAR OF DAVID +2728 ; emoji ; L1 ; none ; j # V6.0 (✨) SPARKLES +2733 ; text ; L1 ; none ; z j # V1.1 (✳) EIGHT SPOKED ASTERISK +2734 ; text ; L1 ; none ; z j # V1.1 (✴) EIGHT POINTED BLACK STAR +2744 ; text ; L1 ; none ; z j w # V1.1 (❄) SNOWFLAKE +2747 ; text ; L1 ; none ; z j # V1.1 (❇) SPARKLE +274C ; emoji ; L1 ; none ; j # V6.0 (❌) CROSS MARK +274E ; emoji ; L1 ; none ; j # V6.0 (❎) NEGATIVE SQUARED CROSS MARK +2753 ; emoji ; L1 ; none ; j w # V6.0 (❓) BLACK QUESTION MARK ORNAMENT +2754 ; emoji ; L1 ; none ; j # V6.0 (❔) WHITE QUESTION MARK ORNAMENT +2755 ; emoji ; L1 ; none ; j # V6.0 (❕) WHITE EXCLAMATION MARK ORNAMENT +2757 ; emoji ; L1 ; none ; j # V5.2 (❗) HEAVY EXCLAMATION MARK SYMBOL +2763 ; text ; L2 ; none ; z # V1.1 (❣) HEAVY HEART EXCLAMATION MARK ORNAMENT +2764 ; text ; L1 ; none ; z j # V1.1 (❤) HEAVY BLACK HEART +2795 ; emoji ; L1 ; none ; j # V6.0 (➕) HEAVY PLUS SIGN +2796 ; emoji ; L1 ; none ; j # V6.0 (➖) HEAVY MINUS SIGN +2797 ; emoji ; L1 ; none ; j # V6.0 (➗) HEAVY DIVISION SIGN +27A1 ; text ; L1 ; none ; z a j # V1.1 (➡) BLACK RIGHTWARDS ARROW +27B0 ; emoji ; L1 ; none ; j # V6.0 (➰) CURLY LOOP +27BF ; emoji ; L1 ; none ; x # V6.0 (➿) DOUBLE CURLY LOOP +2934 ; text ; L1 ; none ; j # V3.2 (⤴) ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS +2935 ; text ; L1 ; none ; j # V3.2 (⤵) ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS +2B05 ; text ; L1 ; none ; a j # V4.0 (⬅) LEFTWARDS BLACK ARROW +2B06 ; text ; L1 ; none ; a j # V4.0 (⬆) UPWARDS BLACK ARROW +2B07 ; text ; L1 ; none ; a j # V4.0 (⬇) DOWNWARDS BLACK ARROW +2B1B ; emoji ; L1 ; none ; a j w # V5.1 (⬛) BLACK LARGE SQUARE +2B1C ; emoji ; L1 ; none ; j w # V5.1 (⬜) WHITE LARGE SQUARE +2B50 ; emoji ; L1 ; none ; j # V5.1 (⭐) WHITE MEDIUM STAR +2B55 ; emoji ; L1 ; none ; j # V5.2 (⭕) HEAVY LARGE CIRCLE +3030 ; text ; L1 ; none ; j # V1.1 (〰) WAVY DASH +303D ; text ; L1 ; none ; j # V3.2 (〽) PART ALTERNATION MARK +3297 ; text ; L1 ; none ; j # V1.1 (㊗) CIRCLED IDEOGRAPH CONGRATULATION +3299 ; text ; L1 ; none ; a j # V1.1 (㊙) CIRCLED IDEOGRAPH SECRET +1F004 ; emoji ; L1 ; none ; j # V5.1 (🀄) MAHJONG TILE RED DRAGON +1F0CF ; emoji ; L1 ; none ; j # V6.0 (🃏) PLAYING CARD BLACK JOKER +1F170 ; text ; L1 ; none ; j # V6.0 (🅰) NEGATIVE SQUARED LATIN CAPITAL LETTER A +1F171 ; text ; L1 ; none ; j # V6.0 (🅱) NEGATIVE SQUARED LATIN CAPITAL LETTER B +1F17E ; text ; L1 ; none ; j # V6.0 (🅾) NEGATIVE SQUARED LATIN CAPITAL LETTER O +1F17F ; text ; L1 ; none ; a j # V5.2 (🅿) NEGATIVE SQUARED LATIN CAPITAL LETTER P +1F18E ; emoji ; L1 ; none ; j # V6.0 (🆎) NEGATIVE SQUARED AB +1F191 ; emoji ; L1 ; none ; j # V6.0 (🆑) SQUARED CL +1F192 ; emoji ; L1 ; none ; j # V6.0 (🆒) SQUARED COOL +1F193 ; emoji ; L1 ; none ; j # V6.0 (🆓) SQUARED FREE +1F194 ; emoji ; L1 ; none ; j # V6.0 (🆔) SQUARED ID +1F195 ; emoji ; L1 ; none ; j # V6.0 (🆕) SQUARED NEW +1F196 ; emoji ; L1 ; none ; j # V6.0 (🆖) SQUARED NG +1F197 ; emoji ; L1 ; none ; j # V6.0 (🆗) SQUARED OK +1F198 ; emoji ; L1 ; none ; j # V6.0 (🆘) SQUARED SOS +1F199 ; emoji ; L1 ; none ; j # V6.0 (🆙) SQUARED UP WITH EXCLAMATION MARK +1F19A ; emoji ; L1 ; none ; j # V6.0 (🆚) SQUARED VS +1F201 ; emoji ; L1 ; none ; j # V6.0 (🈁) SQUARED KATAKANA KOKO +1F202 ; text ; L1 ; none ; j # V6.0 (🈂) SQUARED KATAKANA SA +1F21A ; emoji ; L1 ; none ; a j # V5.2 (🈚) SQUARED CJK UNIFIED IDEOGRAPH-7121 +1F22F ; emoji ; L1 ; none ; a j # V5.2 (🈯) SQUARED CJK UNIFIED IDEOGRAPH-6307 +1F232 ; emoji ; L1 ; none ; j # V6.0 (🈲) SQUARED CJK UNIFIED IDEOGRAPH-7981 +1F233 ; emoji ; L1 ; none ; j # V6.0 (🈳) SQUARED CJK UNIFIED IDEOGRAPH-7A7A +1F234 ; emoji ; L1 ; none ; j # V6.0 (🈴) SQUARED CJK UNIFIED IDEOGRAPH-5408 +1F235 ; emoji ; L1 ; none ; j # V6.0 (🈵) SQUARED CJK UNIFIED IDEOGRAPH-6E80 +1F236 ; emoji ; L1 ; none ; j # V6.0 (🈶) SQUARED CJK UNIFIED IDEOGRAPH-6709 +1F237 ; text ; L1 ; none ; j # V6.0 (🈷) SQUARED CJK UNIFIED IDEOGRAPH-6708 +1F238 ; emoji ; L1 ; none ; j # V6.0 (🈸) SQUARED CJK UNIFIED IDEOGRAPH-7533 +1F239 ; emoji ; L1 ; none ; j # V6.0 (🈹) SQUARED CJK UNIFIED IDEOGRAPH-5272 +1F23A ; emoji ; L1 ; none ; j # V6.0 (🈺) SQUARED CJK UNIFIED IDEOGRAPH-55B6 +1F250 ; emoji ; L1 ; none ; j # V6.0 (🉐) CIRCLED IDEOGRAPH ADVANTAGE +1F251 ; emoji ; L1 ; none ; j # V6.0 (🉑) CIRCLED IDEOGRAPH ACCEPT +1F300 ; emoji ; L1 ; none ; j # V6.0 (🌀) CYCLONE +1F301 ; emoji ; L1 ; none ; j # V6.0 (🌁) FOGGY +1F302 ; emoji ; L1 ; none ; j # V6.0 (🌂) CLOSED UMBRELLA +1F303 ; emoji ; L1 ; none ; j # V6.0 (🌃) NIGHT WITH STARS +1F304 ; emoji ; L1 ; none ; j # V6.0 (🌄) SUNRISE OVER MOUNTAINS +1F305 ; emoji ; L1 ; none ; j # V6.0 (🌅) SUNRISE +1F306 ; emoji ; L1 ; none ; j # V6.0 (🌆) CITYSCAPE AT DUSK +1F307 ; emoji ; L1 ; none ; j # V6.0 (🌇) SUNSET OVER BUILDINGS +1F308 ; emoji ; L1 ; none ; j # V6.0 (🌈) RAINBOW +1F309 ; emoji ; L1 ; none ; j # V6.0 (🌉) BRIDGE AT NIGHT +1F30A ; emoji ; L1 ; none ; j # V6.0 (🌊) WATER WAVE +1F30B ; emoji ; L1 ; none ; j # V6.0 (🌋) VOLCANO +1F30C ; emoji ; L1 ; none ; j # V6.0 (🌌) MILKY WAY +1F30D ; emoji ; L1 ; none ; w # V6.0 (🌍) EARTH GLOBE EUROPE-AFRICA +1F30E ; emoji ; L1 ; none ; w # V6.0 (🌎) EARTH GLOBE AMERICAS +1F30F ; emoji ; L1 ; none ; j w # V6.0 (🌏) EARTH GLOBE ASIA-AUSTRALIA +1F310 ; emoji ; L1 ; none ; x # V6.0 (🌐) GLOBE WITH MERIDIANS +1F311 ; emoji ; L1 ; none ; j # V6.0 (🌑) NEW MOON SYMBOL +1F312 ; emoji ; L1 ; none ; x # V6.0 (🌒) WAXING CRESCENT MOON SYMBOL +1F313 ; emoji ; L1 ; none ; j # V6.0 (🌓) FIRST QUARTER MOON SYMBOL +1F314 ; emoji ; L1 ; none ; j # V6.0 (🌔) WAXING GIBBOUS MOON SYMBOL +1F315 ; emoji ; L1 ; none ; j w # V6.0 (🌕) FULL MOON SYMBOL +1F316 ; emoji ; L1 ; none ; x # V6.0 (🌖) WANING GIBBOUS MOON SYMBOL +1F317 ; emoji ; L1 ; none ; x # V6.0 (🌗) LAST QUARTER MOON SYMBOL +1F318 ; emoji ; L1 ; none ; x # V6.0 (🌘) WANING CRESCENT MOON SYMBOL +1F319 ; emoji ; L1 ; none ; j # V6.0 (🌙) CRESCENT MOON +1F31A ; emoji ; L1 ; none ; x # V6.0 (🌚) NEW MOON WITH FACE +1F31B ; emoji ; L1 ; none ; j # V6.0 (🌛) FIRST QUARTER MOON WITH FACE +1F31C ; emoji ; L1 ; none ; w # V6.0 (🌜) LAST QUARTER MOON WITH FACE +1F31D ; emoji ; L1 ; none ; x # V6.0 (🌝) FULL MOON WITH FACE +1F31E ; emoji ; L1 ; none ; x # V6.0 (🌞) SUN WITH FACE +1F31F ; emoji ; L1 ; none ; j # V6.0 (🌟) GLOWING STAR +1F320 ; emoji ; L1 ; none ; j # V6.0 (🌠) SHOOTING STAR +1F321 ; text ; L2 ; none ; w # V7.0 (🌡) THERMOMETER +1F324 ; text ; L2 ; none ; w # V7.0 (🌤) WHITE SUN WITH SMALL CLOUD +1F325 ; text ; L2 ; none ; w # V7.0 (🌥) WHITE SUN BEHIND CLOUD +1F326 ; text ; L2 ; none ; w # V7.0 (🌦) WHITE SUN BEHIND CLOUD WITH RAIN +1F327 ; text ; L2 ; none ; w # V7.0 (🌧) CLOUD WITH RAIN +1F328 ; text ; L2 ; none ; w # V7.0 (🌨) CLOUD WITH SNOW +1F329 ; text ; L2 ; none ; w # V7.0 (🌩) CLOUD WITH LIGHTNING +1F32A ; text ; L2 ; none ; w # V7.0 (🌪) CLOUD WITH TORNADO +1F32B ; text ; L2 ; none ; w # V7.0 (🌫) FOG +1F32C ; text ; L2 ; none ; w # V7.0 (🌬) WIND BLOWING FACE +1F32D ; emoji ; L2 ; none ; x # V8.0 (🌭) HOT DOG +1F32E ; emoji ; L2 ; none ; x # V8.0 (🌮) TACO +1F32F ; emoji ; L2 ; none ; x # V8.0 (🌯) BURRITO +1F330 ; emoji ; L1 ; none ; j # V6.0 (🌰) CHESTNUT +1F331 ; emoji ; L1 ; none ; j # V6.0 (🌱) SEEDLING +1F332 ; emoji ; L1 ; none ; x # V6.0 (🌲) EVERGREEN TREE +1F333 ; emoji ; L1 ; none ; x # V6.0 (🌳) DECIDUOUS TREE +1F334 ; emoji ; L1 ; none ; j # V6.0 (🌴) PALM TREE +1F335 ; emoji ; L1 ; none ; j # V6.0 (🌵) CACTUS +1F336 ; text ; L2 ; none ; w # V7.0 (🌶) HOT PEPPER +1F337 ; emoji ; L1 ; none ; j # V6.0 (🌷) TULIP +1F338 ; emoji ; L1 ; none ; j # V6.0 (🌸) CHERRY BLOSSOM +1F339 ; emoji ; L1 ; none ; j # V6.0 (🌹) ROSE +1F33A ; emoji ; L1 ; none ; j # V6.0 (🌺) HIBISCUS +1F33B ; emoji ; L1 ; none ; j # V6.0 (🌻) SUNFLOWER +1F33C ; emoji ; L1 ; none ; j # V6.0 (🌼) BLOSSOM +1F33D ; emoji ; L1 ; none ; j # V6.0 (🌽) EAR OF MAIZE +1F33E ; emoji ; L1 ; none ; j # V6.0 (🌾) EAR OF RICE +1F33F ; emoji ; L1 ; none ; j # V6.0 (🌿) HERB +1F340 ; emoji ; L1 ; none ; j # V6.0 (🍀) FOUR LEAF CLOVER +1F341 ; emoji ; L1 ; none ; j # V6.0 (🍁) MAPLE LEAF +1F342 ; emoji ; L1 ; none ; j # V6.0 (🍂) FALLEN LEAF +1F343 ; emoji ; L1 ; none ; j # V6.0 (🍃) LEAF FLUTTERING IN WIND +1F344 ; emoji ; L1 ; none ; j # V6.0 (🍄) MUSHROOM +1F345 ; emoji ; L1 ; none ; j # V6.0 (🍅) TOMATO +1F346 ; emoji ; L1 ; none ; j # V6.0 (🍆) AUBERGINE +1F347 ; emoji ; L1 ; none ; j # V6.0 (🍇) GRAPES +1F348 ; emoji ; L1 ; none ; j # V6.0 (🍈) MELON +1F349 ; emoji ; L1 ; none ; j # V6.0 (🍉) WATERMELON +1F34A ; emoji ; L1 ; none ; j # V6.0 (🍊) TANGERINE +1F34B ; emoji ; L1 ; none ; x # V6.0 (🍋) LEMON +1F34C ; emoji ; L1 ; none ; j # V6.0 (🍌) BANANA +1F34D ; emoji ; L1 ; none ; j # V6.0 (🍍) PINEAPPLE +1F34E ; emoji ; L1 ; none ; j # V6.0 (🍎) RED APPLE +1F34F ; emoji ; L1 ; none ; j # V6.0 (🍏) GREEN APPLE +1F350 ; emoji ; L1 ; none ; x # V6.0 (🍐) PEAR +1F351 ; emoji ; L1 ; none ; j # V6.0 (🍑) PEACH +1F352 ; emoji ; L1 ; none ; j # V6.0 (🍒) CHERRIES +1F353 ; emoji ; L1 ; none ; j # V6.0 (🍓) STRAWBERRY +1F354 ; emoji ; L1 ; none ; j # V6.0 (🍔) HAMBURGER +1F355 ; emoji ; L1 ; none ; j # V6.0 (🍕) SLICE OF PIZZA +1F356 ; emoji ; L1 ; none ; j # V6.0 (🍖) MEAT ON BONE +1F357 ; emoji ; L1 ; none ; j # V6.0 (🍗) POULTRY LEG +1F358 ; emoji ; L1 ; none ; j # V6.0 (🍘) RICE CRACKER +1F359 ; emoji ; L1 ; none ; j # V6.0 (🍙) RICE BALL +1F35A ; emoji ; L1 ; none ; j # V6.0 (🍚) COOKED RICE +1F35B ; emoji ; L1 ; none ; j # V6.0 (🍛) CURRY AND RICE +1F35C ; emoji ; L1 ; none ; j # V6.0 (🍜) STEAMING BOWL +1F35D ; emoji ; L1 ; none ; j # V6.0 (🍝) SPAGHETTI +1F35E ; emoji ; L1 ; none ; j # V6.0 (🍞) BREAD +1F35F ; emoji ; L1 ; none ; j # V6.0 (🍟) FRENCH FRIES +1F360 ; emoji ; L1 ; none ; j # V6.0 (🍠) ROASTED SWEET POTATO +1F361 ; emoji ; L1 ; none ; j # V6.0 (🍡) DANGO +1F362 ; emoji ; L1 ; none ; j # V6.0 (🍢) ODEN +1F363 ; emoji ; L1 ; none ; j # V6.0 (🍣) SUSHI +1F364 ; emoji ; L1 ; none ; j # V6.0 (🍤) FRIED SHRIMP +1F365 ; emoji ; L1 ; none ; j # V6.0 (🍥) FISH CAKE WITH SWIRL DESIGN +1F366 ; emoji ; L1 ; none ; j # V6.0 (🍦) SOFT ICE CREAM +1F367 ; emoji ; L1 ; none ; j # V6.0 (🍧) SHAVED ICE +1F368 ; emoji ; L1 ; none ; j # V6.0 (🍨) ICE CREAM +1F369 ; emoji ; L1 ; none ; j # V6.0 (🍩) DOUGHNUT +1F36A ; emoji ; L1 ; none ; j # V6.0 (🍪) COOKIE +1F36B ; emoji ; L1 ; none ; j # V6.0 (🍫) CHOCOLATE BAR +1F36C ; emoji ; L1 ; none ; j # V6.0 (🍬) CANDY +1F36D ; emoji ; L1 ; none ; j # V6.0 (🍭) LOLLIPOP +1F36E ; emoji ; L1 ; none ; j # V6.0 (🍮) CUSTARD +1F36F ; emoji ; L1 ; none ; j # V6.0 (🍯) HONEY POT +1F370 ; emoji ; L1 ; none ; j # V6.0 (🍰) SHORTCAKE +1F371 ; emoji ; L1 ; none ; j # V6.0 (🍱) BENTO BOX +1F372 ; emoji ; L1 ; none ; j # V6.0 (🍲) POT OF FOOD +1F373 ; emoji ; L1 ; none ; j # V6.0 (🍳) COOKING +1F374 ; emoji ; L1 ; none ; j # V6.0 (🍴) FORK AND KNIFE +1F375 ; emoji ; L1 ; none ; j # V6.0 (🍵) TEACUP WITHOUT HANDLE +1F376 ; emoji ; L1 ; none ; j # V6.0 (🍶) SAKE BOTTLE AND CUP +1F377 ; emoji ; L1 ; none ; j # V6.0 (🍷) WINE GLASS +1F378 ; emoji ; L1 ; none ; j w # V6.0 (🍸) COCKTAIL GLASS +1F379 ; emoji ; L1 ; none ; j # V6.0 (🍹) TROPICAL DRINK +1F37A ; emoji ; L1 ; none ; j # V6.0 (🍺) BEER MUG +1F37B ; emoji ; L1 ; none ; j # V6.0 (🍻) CLINKING BEER MUGS +1F37C ; emoji ; L1 ; none ; x # V6.0 (🍼) BABY BOTTLE +1F37D ; text ; L2 ; none ; w # V7.0 (🍽) FORK AND KNIFE WITH PLATE +1F37E ; emoji ; L2 ; none ; x # V8.0 (🍾) BOTTLE WITH POPPING CORK +1F37F ; emoji ; L2 ; none ; x # V8.0 (🍿) POPCORN +1F380 ; emoji ; L1 ; none ; j # V6.0 (🎀) RIBBON +1F381 ; emoji ; L1 ; none ; j # V6.0 (🎁) WRAPPED PRESENT +1F382 ; emoji ; L1 ; none ; j # V6.0 (🎂) BIRTHDAY CAKE +1F383 ; emoji ; L1 ; none ; j # V6.0 (🎃) JACK-O-LANTERN +1F384 ; emoji ; L1 ; none ; j # V6.0 (🎄) CHRISTMAS TREE +1F385 ; emoji ; L1 ; primary ; j # V6.0 (🎅) FATHER CHRISTMAS +1F386 ; emoji ; L1 ; none ; j # V6.0 (🎆) FIREWORKS +1F387 ; emoji ; L1 ; none ; j # V6.0 (🎇) FIREWORK SPARKLER +1F388 ; emoji ; L1 ; none ; j # V6.0 (🎈) BALLOON +1F389 ; emoji ; L1 ; none ; j # V6.0 (🎉) PARTY POPPER +1F38A ; emoji ; L1 ; none ; j # V6.0 (🎊) CONFETTI BALL +1F38B ; emoji ; L1 ; none ; j # V6.0 (🎋) TANABATA TREE +1F38C ; emoji ; L1 ; none ; j # V6.0 (🎌) CROSSED FLAGS +1F38D ; emoji ; L1 ; none ; j # V6.0 (🎍) PINE DECORATION +1F38E ; emoji ; L1 ; none ; j # V6.0 (🎎) JAPANESE DOLLS +1F38F ; emoji ; L1 ; none ; j # V6.0 (🎏) CARP STREAMER +1F390 ; emoji ; L1 ; none ; j # V6.0 (🎐) WIND CHIME +1F391 ; emoji ; L1 ; none ; j # V6.0 (🎑) MOON VIEWING CEREMONY +1F392 ; emoji ; L1 ; none ; j # V6.0 (🎒) SCHOOL SATCHEL +1F393 ; emoji ; L1 ; none ; j w # V6.0 (🎓) GRADUATION CAP +1F396 ; text ; L2 ; none ; w # V7.0 (🎖) MILITARY MEDAL +1F397 ; text ; L2 ; none ; w # V7.0 (🎗) REMINDER RIBBON +1F399 ; text ; L2 ; none ; w # V7.0 (🎙) STUDIO MICROPHONE +1F39A ; text ; L2 ; none ; w # V7.0 (🎚) LEVEL SLIDER +1F39B ; text ; L2 ; none ; w # V7.0 (🎛) CONTROL KNOBS +1F39E ; text ; L2 ; none ; w # V7.0 (🎞) FILM FRAMES +1F39F ; text ; L2 ; none ; w # V7.0 (🎟) ADMISSION TICKETS +1F3A0 ; emoji ; L1 ; none ; j # V6.0 (🎠) CAROUSEL HORSE +1F3A1 ; emoji ; L1 ; none ; j # V6.0 (🎡) FERRIS WHEEL +1F3A2 ; emoji ; L1 ; none ; j # V6.0 (🎢) ROLLER COASTER +1F3A3 ; emoji ; L1 ; none ; j # V6.0 (🎣) FISHING POLE AND FISH +1F3A4 ; emoji ; L1 ; none ; j # V6.0 (🎤) MICROPHONE +1F3A5 ; emoji ; L1 ; none ; j # V6.0 (🎥) MOVIE CAMERA +1F3A6 ; emoji ; L1 ; none ; j # V6.0 (🎦) CINEMA +1F3A7 ; emoji ; L1 ; none ; j w # V6.0 (🎧) HEADPHONE +1F3A8 ; emoji ; L1 ; none ; j # V6.0 (🎨) ARTIST PALETTE +1F3A9 ; emoji ; L1 ; none ; j # V6.0 (🎩) TOP HAT +1F3AA ; emoji ; L1 ; none ; j # V6.0 (🎪) CIRCUS TENT +1F3AB ; emoji ; L1 ; none ; j # V6.0 (🎫) TICKET +1F3AC ; emoji ; L1 ; none ; j w # V6.0 (🎬) CLAPPER BOARD +1F3AD ; emoji ; L1 ; none ; j w # V6.0 (🎭) PERFORMING ARTS +1F3AE ; emoji ; L1 ; none ; j w # V6.0 (🎮) VIDEO GAME +1F3AF ; emoji ; L1 ; none ; j # V6.0 (🎯) DIRECT HIT +1F3B0 ; emoji ; L1 ; none ; j # V6.0 (🎰) SLOT MACHINE +1F3B1 ; emoji ; L1 ; none ; j # V6.0 (🎱) BILLIARDS +1F3B2 ; emoji ; L1 ; none ; j # V6.0 (🎲) GAME DIE +1F3B3 ; emoji ; L1 ; none ; j # V6.0 (🎳) BOWLING +1F3B4 ; emoji ; L1 ; none ; j # V6.0 (🎴) FLOWER PLAYING CARDS +1F3B5 ; emoji ; L1 ; none ; j # V6.0 (🎵) MUSICAL NOTE +1F3B6 ; emoji ; L1 ; none ; j # V6.0 (🎶) MULTIPLE MUSICAL NOTES +1F3B7 ; emoji ; L1 ; none ; j # V6.0 (🎷) SAXOPHONE +1F3B8 ; emoji ; L1 ; none ; j # V6.0 (🎸) GUITAR +1F3B9 ; emoji ; L1 ; none ; j # V6.0 (🎹) MUSICAL KEYBOARD +1F3BA ; emoji ; L1 ; none ; j # V6.0 (🎺) TRUMPET +1F3BB ; emoji ; L1 ; none ; j # V6.0 (🎻) VIOLIN +1F3BC ; emoji ; L1 ; none ; j # V6.0 (🎼) MUSICAL SCORE +1F3BD ; emoji ; L1 ; none ; j # V6.0 (🎽) RUNNING SHIRT WITH SASH +1F3BE ; emoji ; L1 ; none ; j # V6.0 (🎾) TENNIS RACQUET AND BALL +1F3BF ; emoji ; L1 ; none ; j # V6.0 (🎿) SKI AND SKI BOOT +1F3C0 ; emoji ; L1 ; none ; j # V6.0 (🏀) BASKETBALL AND HOOP +1F3C1 ; emoji ; L1 ; none ; j # V6.0 (🏁) CHEQUERED FLAG +1F3C2 ; emoji ; L1 ; secondary ; j w # V6.0 (🏂) SNOWBOARDER +1F3C3 ; emoji ; L1 ; secondary ; j # V6.0 (🏃) RUNNER +1F3C4 ; emoji ; L1 ; secondary ; j w # V6.0 (🏄) SURFER +1F3C5 ; emoji ; L2 ; none ; x # V7.0 (🏅) SPORTS MEDAL +1F3C6 ; emoji ; L1 ; none ; j w # V6.0 (🏆) TROPHY +1F3C7 ; emoji ; L1 ; secondary ; x # V6.0 (🏇) HORSE RACING +1F3C8 ; emoji ; L1 ; none ; j # V6.0 (🏈) AMERICAN FOOTBALL +1F3C9 ; emoji ; L1 ; none ; x # V6.0 (🏉) RUGBY FOOTBALL +1F3CA ; emoji ; L1 ; secondary ; j w # V6.0 (🏊) SWIMMER +1F3CB ; text ; L2 ; none ; w # V7.0 (🏋) WEIGHT LIFTER +1F3CC ; text ; L2 ; none ; w # V7.0 (🏌) GOLFER +1F3CD ; text ; L2 ; none ; w # V7.0 (🏍) RACING MOTORCYCLE +1F3CE ; text ; L2 ; none ; w # V7.0 (🏎) RACING CAR +1F3CF ; emoji ; L2 ; none ; x # V8.0 (🏏) CRICKET BAT AND BALL +1F3D0 ; emoji ; L2 ; none ; x # V8.0 (🏐) VOLLEYBALL +1F3D1 ; emoji ; L2 ; none ; x # V8.0 (🏑) FIELD HOCKEY STICK AND BALL +1F3D2 ; emoji ; L2 ; none ; x # V8.0 (🏒) ICE HOCKEY STICK AND PUCK +1F3D3 ; emoji ; L2 ; none ; x # V8.0 (🏓) TABLE TENNIS PADDLE AND BALL +1F3D4 ; text ; L2 ; none ; w # V7.0 (🏔) SNOW CAPPED MOUNTAIN +1F3D5 ; text ; L2 ; none ; w # V7.0 (🏕) CAMPING +1F3D6 ; text ; L2 ; none ; w # V7.0 (🏖) BEACH WITH UMBRELLA +1F3D7 ; text ; L2 ; none ; w # V7.0 (🏗) BUILDING CONSTRUCTION +1F3D8 ; text ; L2 ; none ; w # V7.0 (🏘) HOUSE BUILDINGS +1F3D9 ; text ; L2 ; none ; w # V7.0 (🏙) CITYSCAPE +1F3DA ; text ; L2 ; none ; w # V7.0 (🏚) DERELICT HOUSE BUILDING +1F3DB ; text ; L2 ; none ; w # V7.0 (🏛) CLASSICAL BUILDING +1F3DC ; text ; L2 ; none ; w # V7.0 (🏜) DESERT +1F3DD ; text ; L2 ; none ; w # V7.0 (🏝) DESERT ISLAND +1F3DE ; text ; L2 ; none ; w # V7.0 (🏞) NATIONAL PARK +1F3DF ; text ; L2 ; none ; w # V7.0 (🏟) STADIUM +1F3E0 ; emoji ; L1 ; none ; j w # V6.0 (🏠) HOUSE BUILDING +1F3E1 ; emoji ; L1 ; none ; j # V6.0 (🏡) HOUSE WITH GARDEN +1F3E2 ; emoji ; L1 ; none ; j # V6.0 (🏢) OFFICE BUILDING +1F3E3 ; emoji ; L1 ; none ; j # V6.0 (🏣) JAPANESE POST OFFICE +1F3E4 ; emoji ; L1 ; none ; x # V6.0 (🏤) EUROPEAN POST OFFICE +1F3E5 ; emoji ; L1 ; none ; j # V6.0 (🏥) HOSPITAL +1F3E6 ; emoji ; L1 ; none ; j # V6.0 (🏦) BANK +1F3E7 ; emoji ; L1 ; none ; j # V6.0 (🏧) AUTOMATED TELLER MACHINE +1F3E8 ; emoji ; L1 ; none ; j # V6.0 (🏨) HOTEL +1F3E9 ; emoji ; L1 ; none ; j # V6.0 (🏩) LOVE HOTEL +1F3EA ; emoji ; L1 ; none ; j # V6.0 (🏪) CONVENIENCE STORE +1F3EB ; emoji ; L1 ; none ; j # V6.0 (🏫) SCHOOL +1F3EC ; emoji ; L1 ; none ; j # V6.0 (🏬) DEPARTMENT STORE +1F3ED ; emoji ; L1 ; none ; j w # V6.0 (🏭) FACTORY +1F3EE ; emoji ; L1 ; none ; j # V6.0 (🏮) IZAKAYA LANTERN +1F3EF ; emoji ; L1 ; none ; j # V6.0 (🏯) JAPANESE CASTLE +1F3F0 ; emoji ; L1 ; none ; j # V6.0 (🏰) EUROPEAN CASTLE +1F3F3 ; text ; L2 ; none ; w # V7.0 (🏳) WAVING WHITE FLAG +1F3F4 ; emoji ; L2 ; none ; x # V7.0 (🏴) WAVING BLACK FLAG +1F3F5 ; text ; L2 ; none ; w # V7.0 (🏵) ROSETTE +1F3F7 ; text ; L2 ; none ; w # V7.0 (🏷) LABEL +1F3F8 ; emoji ; L2 ; none ; x # V8.0 (🏸) BADMINTON RACQUET AND SHUTTLECOCK +1F3F9 ; emoji ; L2 ; none ; x # V8.0 (🏹) BOW AND ARROW +1F3FA ; emoji ; L2 ; none ; x # V8.0 (🏺) AMPHORA +1F3FB ; emoji ; L2 ; modifier ; x # V8.0 (🏻) EMOJI MODIFIER FITZPATRICK TYPE-1-2 +1F3FC ; emoji ; L2 ; modifier ; x # V8.0 (🏼) EMOJI MODIFIER FITZPATRICK TYPE-3 +1F3FD ; emoji ; L2 ; modifier ; x # V8.0 (🏽) EMOJI MODIFIER FITZPATRICK TYPE-4 +1F3FE ; emoji ; L2 ; modifier ; x # V8.0 (🏾) EMOJI MODIFIER FITZPATRICK TYPE-5 +1F3FF ; emoji ; L2 ; modifier ; x # V8.0 (🏿) EMOJI MODIFIER FITZPATRICK TYPE-6 +1F400 ; emoji ; L1 ; none ; x # V6.0 (🐀) RAT +1F401 ; emoji ; L1 ; none ; x # V6.0 (🐁) MOUSE +1F402 ; emoji ; L1 ; none ; x # V6.0 (🐂) OX +1F403 ; emoji ; L1 ; none ; x # V6.0 (🐃) WATER BUFFALO +1F404 ; emoji ; L1 ; none ; x # V6.0 (🐄) COW +1F405 ; emoji ; L1 ; none ; x # V6.0 (🐅) TIGER +1F406 ; emoji ; L1 ; none ; x # V6.0 (🐆) LEOPARD +1F407 ; emoji ; L1 ; none ; x # V6.0 (🐇) RABBIT +1F408 ; emoji ; L1 ; none ; w # V6.0 (🐈) CAT +1F409 ; emoji ; L1 ; none ; x # V6.0 (🐉) DRAGON +1F40A ; emoji ; L1 ; none ; x # V6.0 (🐊) CROCODILE +1F40B ; emoji ; L1 ; none ; x # V6.0 (🐋) WHALE +1F40C ; emoji ; L1 ; none ; j # V6.0 (🐌) SNAIL +1F40D ; emoji ; L1 ; none ; j # V6.0 (🐍) SNAKE +1F40E ; emoji ; L1 ; none ; j # V6.0 (🐎) HORSE +1F40F ; emoji ; L1 ; none ; x # V6.0 (🐏) RAM +1F410 ; emoji ; L1 ; none ; x # V6.0 (🐐) GOAT +1F411 ; emoji ; L1 ; none ; j # V6.0 (🐑) SHEEP +1F412 ; emoji ; L1 ; none ; j # V6.0 (🐒) MONKEY +1F413 ; emoji ; L1 ; none ; x # V6.0 (🐓) ROOSTER +1F414 ; emoji ; L1 ; none ; j # V6.0 (🐔) CHICKEN +1F415 ; emoji ; L1 ; none ; w # V6.0 (🐕) DOG +1F416 ; emoji ; L1 ; none ; x # V6.0 (🐖) PIG +1F417 ; emoji ; L1 ; none ; j # V6.0 (🐗) BOAR +1F418 ; emoji ; L1 ; none ; j # V6.0 (🐘) ELEPHANT +1F419 ; emoji ; L1 ; none ; j # V6.0 (🐙) OCTOPUS +1F41A ; emoji ; L1 ; none ; j # V6.0 (🐚) SPIRAL SHELL +1F41B ; emoji ; L1 ; none ; j # V6.0 (🐛) BUG +1F41C ; emoji ; L1 ; none ; j # V6.0 (🐜) ANT +1F41D ; emoji ; L1 ; none ; j # V6.0 (🐝) HONEYBEE +1F41E ; emoji ; L1 ; none ; j # V6.0 (🐞) LADY BEETLE +1F41F ; emoji ; L1 ; none ; j w # V6.0 (🐟) FISH +1F420 ; emoji ; L1 ; none ; j # V6.0 (🐠) TROPICAL FISH +1F421 ; emoji ; L1 ; none ; j # V6.0 (🐡) BLOWFISH +1F422 ; emoji ; L1 ; none ; j # V6.0 (🐢) TURTLE +1F423 ; emoji ; L1 ; none ; j # V6.0 (🐣) HATCHING CHICK +1F424 ; emoji ; L1 ; none ; j # V6.0 (🐤) BABY CHICK +1F425 ; emoji ; L1 ; none ; j # V6.0 (🐥) FRONT-FACING BABY CHICK +1F426 ; emoji ; L1 ; none ; j w # V6.0 (🐦) BIRD +1F427 ; emoji ; L1 ; none ; j # V6.0 (🐧) PENGUIN +1F428 ; emoji ; L1 ; none ; j # V6.0 (🐨) KOALA +1F429 ; emoji ; L1 ; none ; j # V6.0 (🐩) POODLE +1F42A ; emoji ; L1 ; none ; x # V6.0 (🐪) DROMEDARY CAMEL +1F42B ; emoji ; L1 ; none ; j # V6.0 (🐫) BACTRIAN CAMEL +1F42C ; emoji ; L1 ; none ; j # V6.0 (🐬) DOLPHIN +1F42D ; emoji ; L1 ; none ; j # V6.0 (🐭) MOUSE FACE +1F42E ; emoji ; L1 ; none ; j # V6.0 (🐮) COW FACE +1F42F ; emoji ; L1 ; none ; j # V6.0 (🐯) TIGER FACE +1F430 ; emoji ; L1 ; none ; j # V6.0 (🐰) RABBIT FACE +1F431 ; emoji ; L1 ; none ; j # V6.0 (🐱) CAT FACE +1F432 ; emoji ; L1 ; none ; j # V6.0 (🐲) DRAGON FACE +1F433 ; emoji ; L1 ; none ; j # V6.0 (🐳) SPOUTING WHALE +1F434 ; emoji ; L1 ; none ; j # V6.0 (🐴) HORSE FACE +1F435 ; emoji ; L1 ; none ; j # V6.0 (🐵) MONKEY FACE +1F436 ; emoji ; L1 ; none ; j # V6.0 (🐶) DOG FACE +1F437 ; emoji ; L1 ; none ; j # V6.0 (🐷) PIG FACE +1F438 ; emoji ; L1 ; none ; j # V6.0 (🐸) FROG FACE +1F439 ; emoji ; L1 ; none ; j # V6.0 (🐹) HAMSTER FACE +1F43A ; emoji ; L1 ; none ; j # V6.0 (🐺) WOLF FACE +1F43B ; emoji ; L1 ; none ; j # V6.0 (🐻) BEAR FACE +1F43C ; emoji ; L1 ; none ; j # V6.0 (🐼) PANDA FACE +1F43D ; emoji ; L1 ; none ; j # V6.0 (🐽) PIG NOSE +1F43E ; emoji ; L1 ; none ; j # V6.0 (🐾) PAW PRINTS +1F43F ; text ; L2 ; none ; w # V7.0 (🐿) CHIPMUNK +1F440 ; emoji ; L1 ; none ; j # V6.0 (👀) EYES +1F441 ; text ; L2 ; none ; w # V7.0 (👁) EYE +1F442 ; emoji ; L1 ; secondary ; j w # V6.0 (👂) EAR +1F443 ; emoji ; L1 ; secondary ; j # V6.0 (👃) NOSE +1F444 ; emoji ; L1 ; none ; j # V6.0 (👄) MOUTH +1F445 ; emoji ; L1 ; none ; j # V6.0 (👅) TONGUE +1F446 ; emoji ; L1 ; secondary ; j w # V6.0 (👆) WHITE UP POINTING BACKHAND INDEX +1F447 ; emoji ; L1 ; secondary ; j w # V6.0 (👇) WHITE DOWN POINTING BACKHAND INDEX +1F448 ; emoji ; L1 ; secondary ; j w # V6.0 (👈) WHITE LEFT POINTING BACKHAND INDEX +1F449 ; emoji ; L1 ; secondary ; j w # V6.0 (👉) WHITE RIGHT POINTING BACKHAND INDEX +1F44A ; emoji ; L1 ; secondary ; j # V6.0 (👊) FISTED HAND SIGN +1F44B ; emoji ; L1 ; secondary ; j # V6.0 (👋) WAVING HAND SIGN +1F44C ; emoji ; L1 ; secondary ; j # V6.0 (👌) OK HAND SIGN +1F44D ; emoji ; L1 ; secondary ; j w # V6.0 (👍) THUMBS UP SIGN +1F44E ; emoji ; L1 ; secondary ; j w # V6.0 (👎) THUMBS DOWN SIGN +1F44F ; emoji ; L1 ; secondary ; j # V6.0 (👏) CLAPPING HANDS SIGN +1F450 ; emoji ; L1 ; secondary ; j # V6.0 (👐) OPEN HANDS SIGN +1F451 ; emoji ; L1 ; none ; j # V6.0 (👑) CROWN +1F452 ; emoji ; L1 ; none ; j # V6.0 (👒) WOMANS HAT +1F453 ; emoji ; L1 ; none ; j w # V6.0 (👓) EYEGLASSES +1F454 ; emoji ; L1 ; none ; j # V6.0 (👔) NECKTIE +1F455 ; emoji ; L1 ; none ; j # V6.0 (👕) T-SHIRT +1F456 ; emoji ; L1 ; none ; j # V6.0 (👖) JEANS +1F457 ; emoji ; L1 ; none ; j # V6.0 (👗) DRESS +1F458 ; emoji ; L1 ; none ; j # V6.0 (👘) KIMONO +1F459 ; emoji ; L1 ; none ; j # V6.0 (👙) BIKINI +1F45A ; emoji ; L1 ; none ; j # V6.0 (👚) WOMANS CLOTHES +1F45B ; emoji ; L1 ; none ; j # V6.0 (👛) PURSE +1F45C ; emoji ; L1 ; none ; j # V6.0 (👜) HANDBAG +1F45D ; emoji ; L1 ; none ; j # V6.0 (👝) POUCH +1F45E ; emoji ; L1 ; none ; j # V6.0 (👞) MANS SHOE +1F45F ; emoji ; L1 ; none ; j # V6.0 (👟) ATHLETIC SHOE +1F460 ; emoji ; L1 ; none ; j # V6.0 (👠) HIGH-HEELED SHOE +1F461 ; emoji ; L1 ; none ; j # V6.0 (👡) WOMANS SANDAL +1F462 ; emoji ; L1 ; none ; j # V6.0 (👢) WOMANS BOOTS +1F463 ; emoji ; L1 ; none ; j # V6.0 (👣) FOOTPRINTS +1F464 ; emoji ; L1 ; none ; j # V6.0 (👤) BUST IN SILHOUETTE +1F465 ; emoji ; L1 ; none ; x # V6.0 (👥) BUSTS IN SILHOUETTE +1F466 ; emoji ; L1 ; primary ; j # V6.0 (👦) BOY +1F467 ; emoji ; L1 ; primary ; j # V6.0 (👧) GIRL +1F468 ; emoji ; L1 ; primary ; j # V6.0 (👨) MAN +1F469 ; emoji ; L1 ; primary ; j # V6.0 (👩) WOMAN +1F46A ; emoji ; L1 ; none ; j w # V6.0 (👪) FAMILY +1F46B ; emoji ; L1 ; none ; j # V6.0 (👫) MAN AND WOMAN HOLDING HANDS +1F46C ; emoji ; L1 ; none ; x # V6.0 (👬) TWO MEN HOLDING HANDS +1F46D ; emoji ; L1 ; none ; x # V6.0 (👭) TWO WOMEN HOLDING HANDS +1F46E ; emoji ; L1 ; primary ; j # V6.0 (👮) POLICE OFFICER +1F46F ; emoji ; L1 ; none ; j # V6.0 (👯) WOMAN WITH BUNNY EARS +1F470 ; emoji ; L1 ; primary ; j # V6.0 (👰) BRIDE WITH VEIL +1F471 ; emoji ; L1 ; primary ; j # V6.0 (👱) PERSON WITH BLOND HAIR +1F472 ; emoji ; L1 ; primary ; j # V6.0 (👲) MAN WITH GUA PI MAO +1F473 ; emoji ; L1 ; primary ; j # V6.0 (👳) MAN WITH TURBAN +1F474 ; emoji ; L1 ; primary ; j # V6.0 (👴) OLDER MAN +1F475 ; emoji ; L1 ; primary ; j # V6.0 (👵) OLDER WOMAN +1F476 ; emoji ; L1 ; primary ; j # V6.0 (👶) BABY +1F477 ; emoji ; L1 ; primary ; j # V6.0 (👷) CONSTRUCTION WORKER +1F478 ; emoji ; L1 ; primary ; j # V6.0 (👸) PRINCESS +1F479 ; emoji ; L1 ; none ; j # V6.0 (👹) JAPANESE OGRE +1F47A ; emoji ; L1 ; none ; j # V6.0 (👺) JAPANESE GOBLIN +1F47B ; emoji ; L1 ; none ; j # V6.0 (👻) GHOST +1F47C ; emoji ; L1 ; primary ; j # V6.0 (👼) BABY ANGEL +1F47D ; emoji ; L1 ; none ; j w # V6.0 (👽) EXTRATERRESTRIAL ALIEN +1F47E ; emoji ; L1 ; none ; j # V6.0 (👾) ALIEN MONSTER +1F47F ; emoji ; L1 ; secondary ; j # V6.0 (👿) IMP +1F480 ; emoji ; L1 ; none ; j # V6.0 (💀) SKULL +1F481 ; emoji ; L1 ; primary ; j # V6.0 (💁) INFORMATION DESK PERSON +1F482 ; emoji ; L1 ; primary ; j # V6.0 (💂) GUARDSMAN +1F483 ; emoji ; L1 ; secondary ; j # V6.0 (💃) DANCER +1F484 ; emoji ; L1 ; none ; j # V6.0 (💄) LIPSTICK +1F485 ; emoji ; L1 ; secondary ; j # V6.0 (💅) NAIL POLISH +1F486 ; emoji ; L1 ; primary ; j # V6.0 (💆) FACE MASSAGE +1F487 ; emoji ; L1 ; primary ; j # V6.0 (💇) HAIRCUT +1F488 ; emoji ; L1 ; none ; j # V6.0 (💈) BARBER POLE +1F489 ; emoji ; L1 ; none ; j # V6.0 (💉) SYRINGE +1F48A ; emoji ; L1 ; none ; j # V6.0 (💊) PILL +1F48B ; emoji ; L1 ; none ; j # V6.0 (💋) KISS MARK +1F48C ; emoji ; L1 ; none ; j # V6.0 (💌) LOVE LETTER +1F48D ; emoji ; L1 ; none ; j # V6.0 (💍) RING +1F48E ; emoji ; L1 ; none ; j # V6.0 (💎) GEM STONE +1F48F ; emoji ; L1 ; none ; j # V6.0 (💏) KISS +1F490 ; emoji ; L1 ; none ; j # V6.0 (💐) BOUQUET +1F491 ; emoji ; L1 ; none ; j # V6.0 (💑) COUPLE WITH HEART +1F492 ; emoji ; L1 ; none ; j # V6.0 (💒) WEDDING +1F493 ; emoji ; L1 ; none ; j # V6.0 (💓) BEATING HEART +1F494 ; emoji ; L1 ; none ; j # V6.0 (💔) BROKEN HEART +1F495 ; emoji ; L1 ; none ; j # V6.0 (💕) TWO HEARTS +1F496 ; emoji ; L1 ; none ; j # V6.0 (💖) SPARKLING HEART +1F497 ; emoji ; L1 ; none ; j # V6.0 (💗) GROWING HEART +1F498 ; emoji ; L1 ; none ; j # V6.0 (💘) HEART WITH ARROW +1F499 ; emoji ; L1 ; none ; j # V6.0 (💙) BLUE HEART +1F49A ; emoji ; L1 ; none ; j # V6.0 (💚) GREEN HEART +1F49B ; emoji ; L1 ; none ; j # V6.0 (💛) YELLOW HEART +1F49C ; emoji ; L1 ; none ; j # V6.0 (💜) PURPLE HEART +1F49D ; emoji ; L1 ; none ; j # V6.0 (💝) HEART WITH RIBBON +1F49E ; emoji ; L1 ; none ; j # V6.0 (💞) REVOLVING HEARTS +1F49F ; emoji ; L1 ; none ; j # V6.0 (💟) HEART DECORATION +1F4A0 ; emoji ; L1 ; none ; j # V6.0 (💠) DIAMOND SHAPE WITH A DOT INSIDE +1F4A1 ; emoji ; L1 ; none ; j # V6.0 (💡) ELECTRIC LIGHT BULB +1F4A2 ; emoji ; L1 ; none ; j # V6.0 (💢) ANGER SYMBOL +1F4A3 ; emoji ; L1 ; none ; j w # V6.0 (💣) BOMB +1F4A4 ; emoji ; L1 ; none ; j # V6.0 (💤) SLEEPING SYMBOL +1F4A5 ; emoji ; L1 ; none ; j # V6.0 (💥) COLLISION SYMBOL +1F4A6 ; emoji ; L1 ; none ; j # V6.0 (💦) SPLASHING SWEAT SYMBOL +1F4A7 ; emoji ; L1 ; none ; j # V6.0 (💧) DROPLET +1F4A8 ; emoji ; L1 ; none ; j # V6.0 (💨) DASH SYMBOL +1F4A9 ; emoji ; L1 ; none ; j # V6.0 (💩) PILE OF POO +1F4AA ; emoji ; L1 ; secondary ; j # V6.0 (💪) FLEXED BICEPS +1F4AB ; emoji ; L1 ; none ; j # V6.0 (💫) DIZZY SYMBOL +1F4AC ; emoji ; L1 ; none ; j # V6.0 (💬) SPEECH BALLOON +1F4AD ; emoji ; L1 ; none ; x # V6.0 (💭) THOUGHT BALLOON +1F4AE ; emoji ; L1 ; none ; j # V6.0 (💮) WHITE FLOWER +1F4AF ; emoji ; L1 ; none ; j # V6.0 (💯) HUNDRED POINTS SYMBOL +1F4B0 ; emoji ; L1 ; none ; j w # V6.0 (💰) MONEY BAG +1F4B1 ; emoji ; L1 ; none ; j # V6.0 (💱) CURRENCY EXCHANGE +1F4B2 ; emoji ; L1 ; none ; j # V6.0 (💲) HEAVY DOLLAR SIGN +1F4B3 ; emoji ; L1 ; none ; j w # V6.0 (💳) CREDIT CARD +1F4B4 ; emoji ; L1 ; none ; j # V6.0 (💴) BANKNOTE WITH YEN SIGN +1F4B5 ; emoji ; L1 ; none ; j # V6.0 (💵) BANKNOTE WITH DOLLAR SIGN +1F4B6 ; emoji ; L1 ; none ; x # V6.0 (💶) BANKNOTE WITH EURO SIGN +1F4B7 ; emoji ; L1 ; none ; x # V6.0 (💷) BANKNOTE WITH POUND SIGN +1F4B8 ; emoji ; L1 ; none ; j # V6.0 (💸) MONEY WITH WINGS +1F4B9 ; emoji ; L1 ; none ; j # V6.0 (💹) CHART WITH UPWARDS TREND AND YEN SIGN +1F4BA ; emoji ; L1 ; none ; j # V6.0 (💺) SEAT +1F4BB ; emoji ; L1 ; none ; j w # V6.0 (💻) PERSONAL COMPUTER +1F4BC ; emoji ; L1 ; none ; j # V6.0 (💼) BRIEFCASE +1F4BD ; emoji ; L1 ; none ; j # V6.0 (💽) MINIDISC +1F4BE ; emoji ; L1 ; none ; j # V6.0 (💾) FLOPPY DISK +1F4BF ; emoji ; L1 ; none ; j w # V6.0 (💿) OPTICAL DISC +1F4C0 ; emoji ; L1 ; none ; j # V6.0 (📀) DVD +1F4C1 ; emoji ; L1 ; none ; j # V6.0 (📁) FILE FOLDER +1F4C2 ; emoji ; L1 ; none ; j # V6.0 (📂) OPEN FILE FOLDER +1F4C3 ; emoji ; L1 ; none ; j # V6.0 (📃) PAGE WITH CURL +1F4C4 ; emoji ; L1 ; none ; j # V6.0 (📄) PAGE FACING UP +1F4C5 ; emoji ; L1 ; none ; j # V6.0 (📅) CALENDAR +1F4C6 ; emoji ; L1 ; none ; j # V6.0 (📆) TEAR-OFF CALENDAR +1F4C7 ; emoji ; L1 ; none ; j # V6.0 (📇) CARD INDEX +1F4C8 ; emoji ; L1 ; none ; j # V6.0 (📈) CHART WITH UPWARDS TREND +1F4C9 ; emoji ; L1 ; none ; j # V6.0 (📉) CHART WITH DOWNWARDS TREND +1F4CA ; emoji ; L1 ; none ; j # V6.0 (📊) BAR CHART +1F4CB ; emoji ; L1 ; none ; j w # V6.0 (📋) CLIPBOARD +1F4CC ; emoji ; L1 ; none ; j # V6.0 (📌) PUSHPIN +1F4CD ; emoji ; L1 ; none ; j # V6.0 (📍) ROUND PUSHPIN +1F4CE ; emoji ; L1 ; none ; j # V6.0 (📎) PAPERCLIP +1F4CF ; emoji ; L1 ; none ; j # V6.0 (📏) STRAIGHT RULER +1F4D0 ; emoji ; L1 ; none ; j # V6.0 (📐) TRIANGULAR RULER +1F4D1 ; emoji ; L1 ; none ; j # V6.0 (📑) BOOKMARK TABS +1F4D2 ; emoji ; L1 ; none ; j # V6.0 (📒) LEDGER +1F4D3 ; emoji ; L1 ; none ; j # V6.0 (📓) NOTEBOOK +1F4D4 ; emoji ; L1 ; none ; j # V6.0 (📔) NOTEBOOK WITH DECORATIVE COVER +1F4D5 ; emoji ; L1 ; none ; j # V6.0 (📕) CLOSED BOOK +1F4D6 ; emoji ; L1 ; none ; j # V6.0 (📖) OPEN BOOK +1F4D7 ; emoji ; L1 ; none ; j # V6.0 (📗) GREEN BOOK +1F4D8 ; emoji ; L1 ; none ; j # V6.0 (📘) BLUE BOOK +1F4D9 ; emoji ; L1 ; none ; j # V6.0 (📙) ORANGE BOOK +1F4DA ; emoji ; L1 ; none ; j w # V6.0 (📚) BOOKS +1F4DB ; emoji ; L1 ; none ; j # V6.0 (📛) NAME BADGE +1F4DC ; emoji ; L1 ; none ; j # V6.0 (📜) SCROLL +1F4DD ; emoji ; L1 ; none ; j # V6.0 (📝) MEMO +1F4DE ; emoji ; L1 ; none ; j # V6.0 (📞) TELEPHONE RECEIVER +1F4DF ; emoji ; L1 ; none ; j w # V6.0 (📟) PAGER +1F4E0 ; emoji ; L1 ; none ; j # V6.0 (📠) FAX MACHINE +1F4E1 ; emoji ; L1 ; none ; j # V6.0 (📡) SATELLITE ANTENNA +1F4E2 ; emoji ; L1 ; none ; j # V6.0 (📢) PUBLIC ADDRESS LOUDSPEAKER +1F4E3 ; emoji ; L1 ; none ; j # V6.0 (📣) CHEERING MEGAPHONE +1F4E4 ; emoji ; L1 ; none ; j w # V6.0 (📤) OUTBOX TRAY +1F4E5 ; emoji ; L1 ; none ; j w # V6.0 (📥) INBOX TRAY +1F4E6 ; emoji ; L1 ; none ; j w # V6.0 (📦) PACKAGE +1F4E7 ; emoji ; L1 ; none ; j # V6.0 (📧) E-MAIL SYMBOL +1F4E8 ; emoji ; L1 ; none ; j # V6.0 (📨) INCOMING ENVELOPE +1F4E9 ; emoji ; L1 ; none ; j # V6.0 (📩) ENVELOPE WITH DOWNWARDS ARROW ABOVE +1F4EA ; emoji ; L1 ; none ; j w # V6.0 (📪) CLOSED MAILBOX WITH LOWERED FLAG +1F4EB ; emoji ; L1 ; none ; j w # V6.0 (📫) CLOSED MAILBOX WITH RAISED FLAG +1F4EC ; emoji ; L1 ; none ; w # V6.0 (📬) OPEN MAILBOX WITH RAISED FLAG +1F4ED ; emoji ; L1 ; none ; w # V6.0 (📭) OPEN MAILBOX WITH LOWERED FLAG +1F4EE ; emoji ; L1 ; none ; j # V6.0 (📮) POSTBOX +1F4EF ; emoji ; L1 ; none ; x # V6.0 (📯) POSTAL HORN +1F4F0 ; emoji ; L1 ; none ; j # V6.0 (📰) NEWSPAPER +1F4F1 ; emoji ; L1 ; none ; j # V6.0 (📱) MOBILE PHONE +1F4F2 ; emoji ; L1 ; none ; j # V6.0 (📲) MOBILE PHONE WITH RIGHTWARDS ARROW AT LEFT +1F4F3 ; emoji ; L1 ; none ; j # V6.0 (📳) VIBRATION MODE +1F4F4 ; emoji ; L1 ; none ; j # V6.0 (📴) MOBILE PHONE OFF +1F4F5 ; emoji ; L1 ; none ; x # V6.0 (📵) NO MOBILE PHONES +1F4F6 ; emoji ; L1 ; none ; j # V6.0 (📶) ANTENNA WITH BARS +1F4F7 ; emoji ; L1 ; none ; j w # V6.0 (📷) CAMERA +1F4F8 ; emoji ; L2 ; none ; x # V7.0 (📸) CAMERA WITH FLASH +1F4F9 ; emoji ; L1 ; none ; j w # V6.0 (📹) VIDEO CAMERA +1F4FA ; emoji ; L1 ; none ; j w # V6.0 (📺) TELEVISION +1F4FB ; emoji ; L1 ; none ; j w # V6.0 (📻) RADIO +1F4FC ; emoji ; L1 ; none ; j # V6.0 (📼) VIDEOCASSETTE +1F4FD ; text ; L2 ; none ; w # V7.0 (📽) FILM PROJECTOR +1F4FF ; emoji ; L2 ; none ; x # V8.0 (📿) PRAYER BEADS +1F500 ; emoji ; L1 ; none ; x # V6.0 (🔀) TWISTED RIGHTWARDS ARROWS +1F501 ; emoji ; L1 ; none ; x # V6.0 (🔁) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS +1F502 ; emoji ; L1 ; none ; x # V6.0 (🔂) CLOCKWISE RIGHTWARDS AND LEFTWARDS OPEN CIRCLE ARROWS WITH CIRCLED ONE OVERLAY +1F503 ; emoji ; L1 ; none ; j # V6.0 (🔃) CLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS +1F504 ; emoji ; L1 ; none ; x # V6.0 (🔄) ANTICLOCKWISE DOWNWARDS AND UPWARDS OPEN CIRCLE ARROWS +1F505 ; emoji ; L1 ; none ; x # V6.0 (🔅) LOW BRIGHTNESS SYMBOL +1F506 ; emoji ; L1 ; none ; x # V6.0 (🔆) HIGH BRIGHTNESS SYMBOL +1F507 ; emoji ; L1 ; none ; x # V6.0 (🔇) SPEAKER WITH CANCELLATION STROKE +1F508 ; emoji ; L1 ; none ; w # V6.0 (🔈) SPEAKER +1F509 ; emoji ; L1 ; none ; x # V6.0 (🔉) SPEAKER WITH ONE SOUND WAVE +1F50A ; emoji ; L1 ; none ; j # V6.0 (🔊) SPEAKER WITH THREE SOUND WAVES +1F50B ; emoji ; L1 ; none ; j # V6.0 (🔋) BATTERY +1F50C ; emoji ; L1 ; none ; j # V6.0 (🔌) ELECTRIC PLUG +1F50D ; emoji ; L1 ; none ; j w # V6.0 (🔍) LEFT-POINTING MAGNIFYING GLASS +1F50E ; emoji ; L1 ; none ; j # V6.0 (🔎) RIGHT-POINTING MAGNIFYING GLASS +1F50F ; emoji ; L1 ; none ; j # V6.0 (🔏) LOCK WITH INK PEN +1F510 ; emoji ; L1 ; none ; j # V6.0 (🔐) CLOSED LOCK WITH KEY +1F511 ; emoji ; L1 ; none ; j # V6.0 (🔑) KEY +1F512 ; emoji ; L1 ; none ; j w # V6.0 (🔒) LOCK +1F513 ; emoji ; L1 ; none ; j w # V6.0 (🔓) OPEN LOCK +1F514 ; emoji ; L1 ; none ; j # V6.0 (🔔) BELL +1F515 ; emoji ; L1 ; none ; x # V6.0 (🔕) BELL WITH CANCELLATION STROKE +1F516 ; emoji ; L1 ; none ; j # V6.0 (🔖) BOOKMARK +1F517 ; emoji ; L1 ; none ; j # V6.0 (🔗) LINK SYMBOL +1F518 ; emoji ; L1 ; none ; j # V6.0 (🔘) RADIO BUTTON +1F519 ; emoji ; L1 ; none ; j # V6.0 (🔙) BACK WITH LEFTWARDS ARROW ABOVE +1F51A ; emoji ; L1 ; none ; j # V6.0 (🔚) END WITH LEFTWARDS ARROW ABOVE +1F51B ; emoji ; L1 ; none ; j # V6.0 (🔛) ON WITH EXCLAMATION MARK WITH LEFT RIGHT ARROW ABOVE +1F51C ; emoji ; L1 ; none ; j # V6.0 (🔜) SOON WITH RIGHTWARDS ARROW ABOVE +1F51D ; emoji ; L1 ; none ; j # V6.0 (🔝) TOP WITH UPWARDS ARROW ABOVE +1F51E ; emoji ; L1 ; none ; j # V6.0 (🔞) NO ONE UNDER EIGHTEEN SYMBOL +1F51F ; emoji ; L1 ; none ; j # V6.0 (🔟) KEYCAP TEN +1F520 ; emoji ; L1 ; none ; j # V6.0 (🔠) INPUT SYMBOL FOR LATIN CAPITAL LETTERS +1F521 ; emoji ; L1 ; none ; j # V6.0 (🔡) INPUT SYMBOL FOR LATIN SMALL LETTERS +1F522 ; emoji ; L1 ; none ; j # V6.0 (🔢) INPUT SYMBOL FOR NUMBERS +1F523 ; emoji ; L1 ; none ; j # V6.0 (🔣) INPUT SYMBOL FOR SYMBOLS +1F524 ; emoji ; L1 ; none ; j # V6.0 (🔤) INPUT SYMBOL FOR LATIN LETTERS +1F525 ; emoji ; L1 ; none ; j # V6.0 (🔥) FIRE +1F526 ; emoji ; L1 ; none ; j # V6.0 (🔦) ELECTRIC TORCH +1F527 ; emoji ; L1 ; none ; j # V6.0 (🔧) WRENCH +1F528 ; emoji ; L1 ; none ; j # V6.0 (🔨) HAMMER +1F529 ; emoji ; L1 ; none ; j # V6.0 (🔩) NUT AND BOLT +1F52A ; emoji ; L1 ; none ; j # V6.0 (🔪) HOCHO +1F52B ; emoji ; L1 ; none ; j # V6.0 (🔫) PISTOL +1F52C ; emoji ; L1 ; none ; x # V6.0 (🔬) MICROSCOPE +1F52D ; emoji ; L1 ; none ; x # V6.0 (🔭) TELESCOPE +1F52E ; emoji ; L1 ; none ; j # V6.0 (🔮) CRYSTAL BALL +1F52F ; emoji ; L1 ; none ; j # V6.0 (🔯) SIX POINTED STAR WITH MIDDLE DOT +1F530 ; emoji ; L1 ; none ; j # V6.0 (🔰) JAPANESE SYMBOL FOR BEGINNER +1F531 ; emoji ; L1 ; none ; j # V6.0 (🔱) TRIDENT EMBLEM +1F532 ; emoji ; L1 ; none ; j # V6.0 (🔲) BLACK SQUARE BUTTON +1F533 ; emoji ; L1 ; none ; j # V6.0 (🔳) WHITE SQUARE BUTTON +1F534 ; emoji ; L1 ; none ; j # V6.0 (🔴) LARGE RED CIRCLE +1F535 ; emoji ; L1 ; none ; j # V6.0 (🔵) LARGE BLUE CIRCLE +1F536 ; emoji ; L1 ; none ; j # V6.0 (🔶) LARGE ORANGE DIAMOND +1F537 ; emoji ; L1 ; none ; j # V6.0 (🔷) LARGE BLUE DIAMOND +1F538 ; emoji ; L1 ; none ; j # V6.0 (🔸) SMALL ORANGE DIAMOND +1F539 ; emoji ; L1 ; none ; j # V6.0 (🔹) SMALL BLUE DIAMOND +1F53A ; emoji ; L1 ; none ; j # V6.0 (🔺) UP-POINTING RED TRIANGLE +1F53B ; emoji ; L1 ; none ; j # V6.0 (🔻) DOWN-POINTING RED TRIANGLE +1F53C ; emoji ; L1 ; none ; j # V6.0 (🔼) UP-POINTING SMALL RED TRIANGLE +1F53D ; emoji ; L1 ; none ; j # V6.0 (🔽) DOWN-POINTING SMALL RED TRIANGLE +1F549 ; text ; L2 ; none ; w # V7.0 (🕉) OM SYMBOL +1F54A ; text ; L2 ; none ; w # V7.0 (🕊) DOVE OF PEACE +1F54B ; emoji ; L2 ; none ; x # V8.0 (🕋) KAABA +1F54C ; emoji ; L2 ; none ; x # V8.0 (🕌) MOSQUE +1F54D ; emoji ; L2 ; none ; x # V8.0 (🕍) SYNAGOGUE +1F54E ; emoji ; L2 ; none ; x # V8.0 (🕎) MENORAH WITH NINE BRANCHES +1F550 ; emoji ; L1 ; none ; j w # V6.0 (🕐) CLOCK FACE ONE OCLOCK +1F551 ; emoji ; L1 ; none ; j w # V6.0 (🕑) CLOCK FACE TWO OCLOCK +1F552 ; emoji ; L1 ; none ; j w # V6.0 (🕒) CLOCK FACE THREE OCLOCK +1F553 ; emoji ; L1 ; none ; j w # V6.0 (🕓) CLOCK FACE FOUR OCLOCK +1F554 ; emoji ; L1 ; none ; j w # V6.0 (🕔) CLOCK FACE FIVE OCLOCK +1F555 ; emoji ; L1 ; none ; j w # V6.0 (🕕) CLOCK FACE SIX OCLOCK +1F556 ; emoji ; L1 ; none ; j w # V6.0 (🕖) CLOCK FACE SEVEN OCLOCK +1F557 ; emoji ; L1 ; none ; j w # V6.0 (🕗) CLOCK FACE EIGHT OCLOCK +1F558 ; emoji ; L1 ; none ; j w # V6.0 (🕘) CLOCK FACE NINE OCLOCK +1F559 ; emoji ; L1 ; none ; j w # V6.0 (🕙) CLOCK FACE TEN OCLOCK +1F55A ; emoji ; L1 ; none ; j w # V6.0 (🕚) CLOCK FACE ELEVEN OCLOCK +1F55B ; emoji ; L1 ; none ; j w # V6.0 (🕛) CLOCK FACE TWELVE OCLOCK +1F55C ; emoji ; L1 ; none ; w # V6.0 (🕜) CLOCK FACE ONE-THIRTY +1F55D ; emoji ; L1 ; none ; w # V6.0 (🕝) CLOCK FACE TWO-THIRTY +1F55E ; emoji ; L1 ; none ; w # V6.0 (🕞) CLOCK FACE THREE-THIRTY +1F55F ; emoji ; L1 ; none ; w # V6.0 (🕟) CLOCK FACE FOUR-THIRTY +1F560 ; emoji ; L1 ; none ; w # V6.0 (🕠) CLOCK FACE FIVE-THIRTY +1F561 ; emoji ; L1 ; none ; w # V6.0 (🕡) CLOCK FACE SIX-THIRTY +1F562 ; emoji ; L1 ; none ; w # V6.0 (🕢) CLOCK FACE SEVEN-THIRTY +1F563 ; emoji ; L1 ; none ; w # V6.0 (🕣) CLOCK FACE EIGHT-THIRTY +1F564 ; emoji ; L1 ; none ; w # V6.0 (🕤) CLOCK FACE NINE-THIRTY +1F565 ; emoji ; L1 ; none ; w # V6.0 (🕥) CLOCK FACE TEN-THIRTY +1F566 ; emoji ; L1 ; none ; w # V6.0 (🕦) CLOCK FACE ELEVEN-THIRTY +1F567 ; emoji ; L1 ; none ; w # V6.0 (🕧) CLOCK FACE TWELVE-THIRTY +1F56F ; text ; L2 ; none ; w # V7.0 (🕯) CANDLE +1F570 ; text ; L2 ; none ; w # V7.0 (🕰) MANTELPIECE CLOCK +1F573 ; text ; L2 ; none ; w # V7.0 (🕳) HOLE +1F574 ; text ; L2 ; none ; w # V7.0 (🕴) MAN IN BUSINESS SUIT LEVITATING +1F575 ; text ; L2 ; none ; w # V7.0 (🕵) SLEUTH OR SPY +1F576 ; text ; L2 ; none ; w # V7.0 (🕶) DARK SUNGLASSES +1F577 ; text ; L2 ; none ; w # V7.0 (🕷) SPIDER +1F578 ; text ; L2 ; none ; w # V7.0 (🕸) SPIDER WEB +1F579 ; text ; L2 ; none ; w # V7.0 (🕹) JOYSTICK +1F587 ; text ; L2 ; none ; w # V7.0 (🖇) LINKED PAPERCLIPS +1F58A ; text ; L2 ; none ; w # V7.0 (🖊) LOWER LEFT BALLPOINT PEN +1F58B ; text ; L2 ; none ; w # V7.0 (🖋) LOWER LEFT FOUNTAIN PEN +1F58C ; text ; L2 ; none ; w # V7.0 (🖌) LOWER LEFT PAINTBRUSH +1F58D ; text ; L2 ; none ; w # V7.0 (🖍) LOWER LEFT CRAYON +1F590 ; text ; L2 ; secondary ; w # V7.0 (🖐) RAISED HAND WITH FINGERS SPLAYED +1F595 ; emoji ; L2 ; secondary ; x # V7.0 (🖕) REVERSED HAND WITH MIDDLE FINGER EXTENDED +1F596 ; emoji ; L2 ; secondary ; x # V7.0 (🖖) RAISED HAND WITH PART BETWEEN MIDDLE AND RING FINGERS +1F5A5 ; text ; L2 ; none ; w # V7.0 (🖥) DESKTOP COMPUTER +1F5A8 ; text ; L2 ; none ; w # V7.0 (🖨) PRINTER +1F5B1 ; text ; L2 ; none ; w # V7.0 (🖱) THREE BUTTON MOUSE +1F5B2 ; text ; L2 ; none ; w # V7.0 (🖲) TRACKBALL +1F5BC ; text ; L2 ; none ; w # V7.0 (🖼) FRAME WITH PICTURE +1F5C2 ; text ; L2 ; none ; w # V7.0 (🗂) CARD INDEX DIVIDERS +1F5C3 ; text ; L2 ; none ; w # V7.0 (🗃) CARD FILE BOX +1F5C4 ; text ; L2 ; none ; w # V7.0 (🗄) FILE CABINET +1F5D1 ; text ; L2 ; none ; w # V7.0 (🗑) WASTEBASKET +1F5D2 ; text ; L2 ; none ; w # V7.0 (🗒) SPIRAL NOTE PAD +1F5D3 ; text ; L2 ; none ; w # V7.0 (🗓) SPIRAL CALENDAR PAD +1F5DC ; text ; L2 ; none ; w # V7.0 (🗜) COMPRESSION +1F5DD ; text ; L2 ; none ; w # V7.0 (🗝) OLD KEY +1F5DE ; text ; L2 ; none ; w # V7.0 (🗞) ROLLED-UP NEWSPAPER +1F5E1 ; text ; L2 ; none ; w # V7.0 (🗡) DAGGER KNIFE +1F5E3 ; text ; L2 ; none ; w # V7.0 (🗣) SPEAKING HEAD IN SILHOUETTE +1F5EF ; text ; L2 ; none ; w # V7.0 (🗯) RIGHT ANGER BUBBLE +1F5F3 ; text ; L2 ; none ; w # V7.0 (🗳) BALLOT BOX WITH BALLOT +1F5FA ; text ; L2 ; none ; w # V7.0 (🗺) WORLD MAP +1F5FB ; emoji ; L1 ; none ; j # V6.0 (🗻) MOUNT FUJI +1F5FC ; emoji ; L1 ; none ; j # V6.0 (🗼) TOKYO TOWER +1F5FD ; emoji ; L1 ; none ; j # V6.0 (🗽) STATUE OF LIBERTY +1F5FE ; emoji ; L1 ; none ; j # V6.0 (🗾) SILHOUETTE OF JAPAN +1F5FF ; emoji ; L1 ; none ; j # V6.0 (🗿) MOYAI +1F600 ; emoji ; L1 ; secondary ; x # V6.1 (😀) GRINNING FACE +1F601 ; emoji ; L1 ; secondary ; j # V6.0 (😁) GRINNING FACE WITH SMILING EYES +1F602 ; emoji ; L1 ; secondary ; j # V6.0 (😂) FACE WITH TEARS OF JOY +1F603 ; emoji ; L1 ; secondary ; j # V6.0 (😃) SMILING FACE WITH OPEN MOUTH +1F604 ; emoji ; L1 ; secondary ; j # V6.0 (😄) SMILING FACE WITH OPEN MOUTH AND SMILING EYES +1F605 ; emoji ; L1 ; secondary ; j # V6.0 (😅) SMILING FACE WITH OPEN MOUTH AND COLD SWEAT +1F606 ; emoji ; L1 ; secondary ; j # V6.0 (😆) SMILING FACE WITH OPEN MOUTH AND TIGHTLY-CLOSED EYES +1F607 ; emoji ; L1 ; secondary ; x # V6.0 (😇) SMILING FACE WITH HALO +1F608 ; emoji ; L1 ; secondary ; x # V6.0 (😈) SMILING FACE WITH HORNS +1F609 ; emoji ; L1 ; secondary ; j # V6.0 (😉) WINKING FACE +1F60A ; emoji ; L1 ; secondary ; j # V6.0 (😊) SMILING FACE WITH SMILING EYES +1F60B ; emoji ; L1 ; secondary ; j # V6.0 (😋) FACE SAVOURING DELICIOUS FOOD +1F60C ; emoji ; L1 ; secondary ; j # V6.0 (😌) RELIEVED FACE +1F60D ; emoji ; L1 ; secondary ; j # V6.0 (😍) SMILING FACE WITH HEART-SHAPED EYES +1F60E ; emoji ; L1 ; secondary ; x # V6.0 (😎) SMILING FACE WITH SUNGLASSES +1F60F ; emoji ; L1 ; secondary ; j # V6.0 (😏) SMIRKING FACE +1F610 ; emoji ; L1 ; secondary ; w # V6.0 (😐) NEUTRAL FACE +1F611 ; emoji ; L1 ; secondary ; x # V6.1 (😑) EXPRESSIONLESS FACE +1F612 ; emoji ; L1 ; secondary ; j # V6.0 (😒) UNAMUSED FACE +1F613 ; emoji ; L1 ; secondary ; j # V6.0 (😓) FACE WITH COLD SWEAT +1F614 ; emoji ; L1 ; secondary ; j # V6.0 (😔) PENSIVE FACE +1F615 ; emoji ; L1 ; secondary ; x # V6.1 (😕) CONFUSED FACE +1F616 ; emoji ; L1 ; secondary ; j # V6.0 (😖) CONFOUNDED FACE +1F617 ; emoji ; L1 ; secondary ; x # V6.1 (😗) KISSING FACE +1F618 ; emoji ; L1 ; secondary ; j # V6.0 (😘) FACE THROWING A KISS +1F619 ; emoji ; L1 ; secondary ; x # V6.1 (😙) KISSING FACE WITH SMILING EYES +1F61A ; emoji ; L1 ; secondary ; j # V6.0 (😚) KISSING FACE WITH CLOSED EYES +1F61B ; emoji ; L1 ; secondary ; x # V6.1 (😛) FACE WITH STUCK-OUT TONGUE +1F61C ; emoji ; L1 ; secondary ; j # V6.0 (😜) FACE WITH STUCK-OUT TONGUE AND WINKING EYE +1F61D ; emoji ; L1 ; secondary ; j # V6.0 (😝) FACE WITH STUCK-OUT TONGUE AND TIGHTLY-CLOSED EYES +1F61E ; emoji ; L1 ; secondary ; j # V6.0 (😞) DISAPPOINTED FACE +1F61F ; emoji ; L1 ; secondary ; x # V6.1 (😟) WORRIED FACE +1F620 ; emoji ; L1 ; secondary ; j # V6.0 (😠) ANGRY FACE +1F621 ; emoji ; L1 ; secondary ; j # V6.0 (😡) POUTING FACE +1F622 ; emoji ; L1 ; secondary ; j # V6.0 (😢) CRYING FACE +1F623 ; emoji ; L1 ; secondary ; j # V6.0 (😣) PERSEVERING FACE +1F624 ; emoji ; L1 ; secondary ; j # V6.0 (😤) FACE WITH LOOK OF TRIUMPH +1F625 ; emoji ; L1 ; secondary ; j # V6.0 (😥) DISAPPOINTED BUT RELIEVED FACE +1F626 ; emoji ; L1 ; secondary ; x # V6.1 (😦) FROWNING FACE WITH OPEN MOUTH +1F627 ; emoji ; L1 ; secondary ; x # V6.1 (😧) ANGUISHED FACE +1F628 ; emoji ; L1 ; secondary ; j # V6.0 (😨) FEARFUL FACE +1F629 ; emoji ; L1 ; secondary ; j # V6.0 (😩) WEARY FACE +1F62A ; emoji ; L1 ; secondary ; j # V6.0 (😪) SLEEPY FACE +1F62B ; emoji ; L1 ; secondary ; j # V6.0 (😫) TIRED FACE +1F62C ; emoji ; L1 ; secondary ; x # V6.1 (😬) GRIMACING FACE +1F62D ; emoji ; L1 ; secondary ; j # V6.0 (😭) LOUDLY CRYING FACE +1F62E ; emoji ; L1 ; secondary ; x # V6.1 (😮) FACE WITH OPEN MOUTH +1F62F ; emoji ; L1 ; secondary ; x # V6.1 (😯) HUSHED FACE +1F630 ; emoji ; L1 ; secondary ; j # V6.0 (😰) FACE WITH OPEN MOUTH AND COLD SWEAT +1F631 ; emoji ; L1 ; secondary ; j # V6.0 (😱) FACE SCREAMING IN FEAR +1F632 ; emoji ; L1 ; secondary ; j # V6.0 (😲) ASTONISHED FACE +1F633 ; emoji ; L1 ; secondary ; j # V6.0 (😳) FLUSHED FACE +1F634 ; emoji ; L1 ; secondary ; x # V6.1 (😴) SLEEPING FACE +1F635 ; emoji ; L1 ; secondary ; j # V6.0 (😵) DIZZY FACE +1F636 ; emoji ; L1 ; secondary ; x # V6.0 (😶) FACE WITHOUT MOUTH +1F637 ; emoji ; L1 ; secondary ; j # V6.0 (😷) FACE WITH MEDICAL MASK +1F638 ; emoji ; L1 ; none ; j # V6.0 (😸) GRINNING CAT FACE WITH SMILING EYES +1F639 ; emoji ; L1 ; none ; j # V6.0 (😹) CAT FACE WITH TEARS OF JOY +1F63A ; emoji ; L1 ; none ; j # V6.0 (😺) SMILING CAT FACE WITH OPEN MOUTH +1F63B ; emoji ; L1 ; none ; j # V6.0 (😻) SMILING CAT FACE WITH HEART-SHAPED EYES +1F63C ; emoji ; L1 ; none ; j # V6.0 (😼) CAT FACE WITH WRY SMILE +1F63D ; emoji ; L1 ; none ; j # V6.0 (😽) KISSING CAT FACE WITH CLOSED EYES +1F63E ; emoji ; L1 ; none ; j # V6.0 (😾) POUTING CAT FACE +1F63F ; emoji ; L1 ; none ; j # V6.0 (😿) CRYING CAT FACE +1F640 ; emoji ; L1 ; none ; j # V6.0 (🙀) WEARY CAT FACE +1F641 ; emoji ; L2 ; secondary ; x # V7.0 (🙁) SLIGHTLY FROWNING FACE +1F642 ; emoji ; L2 ; secondary ; x # V7.0 (🙂) SLIGHTLY SMILING FACE +1F643 ; emoji ; L2 ; secondary ; x # V8.0 (🙃) UPSIDE-DOWN FACE +1F644 ; emoji ; L2 ; secondary ; x # V8.0 (🙄) FACE WITH ROLLING EYES +1F645 ; emoji ; L1 ; primary ; j # V6.0 (🙅) FACE WITH NO GOOD GESTURE +1F646 ; emoji ; L1 ; primary ; j # V6.0 (🙆) FACE WITH OK GESTURE +1F647 ; emoji ; L1 ; primary ; j # V6.0 (🙇) PERSON BOWING DEEPLY +1F648 ; emoji ; L1 ; none ; j # V6.0 (🙈) SEE-NO-EVIL MONKEY +1F649 ; emoji ; L1 ; none ; j # V6.0 (🙉) HEAR-NO-EVIL MONKEY +1F64A ; emoji ; L1 ; none ; j # V6.0 (🙊) SPEAK-NO-EVIL MONKEY +1F64B ; emoji ; L1 ; primary ; j # V6.0 (🙋) HAPPY PERSON RAISING ONE HAND +1F64C ; emoji ; L1 ; secondary ; j # V6.0 (🙌) PERSON RAISING BOTH HANDS IN CELEBRATION +1F64D ; emoji ; L1 ; primary ; j # V6.0 (🙍) PERSON FROWNING +1F64E ; emoji ; L1 ; primary ; j # V6.0 (🙎) PERSON WITH POUTING FACE +1F64F ; emoji ; L1 ; secondary ; j # V6.0 (🙏) PERSON WITH FOLDED HANDS +1F680 ; emoji ; L1 ; none ; j # V6.0 (🚀) ROCKET +1F681 ; emoji ; L1 ; none ; x # V6.0 (🚁) HELICOPTER +1F682 ; emoji ; L1 ; none ; x # V6.0 (🚂) STEAM LOCOMOTIVE +1F683 ; emoji ; L1 ; none ; j # V6.0 (🚃) RAILWAY CAR +1F684 ; emoji ; L1 ; none ; j # V6.0 (🚄) HIGH-SPEED TRAIN +1F685 ; emoji ; L1 ; none ; j # V6.0 (🚅) HIGH-SPEED TRAIN WITH BULLET NOSE +1F686 ; emoji ; L1 ; none ; x # V6.0 (🚆) TRAIN +1F687 ; emoji ; L1 ; none ; j w # V6.0 (🚇) METRO +1F688 ; emoji ; L1 ; none ; x # V6.0 (🚈) LIGHT RAIL +1F689 ; emoji ; L1 ; none ; j # V6.0 (🚉) STATION +1F68A ; emoji ; L1 ; none ; x # V6.0 (🚊) TRAM +1F68B ; emoji ; L1 ; none ; x # V6.0 (🚋) TRAM CAR +1F68C ; emoji ; L1 ; none ; j # V6.0 (🚌) BUS +1F68D ; emoji ; L1 ; none ; w # V6.0 (🚍) ONCOMING BUS +1F68E ; emoji ; L1 ; none ; x # V6.0 (🚎) TROLLEYBUS +1F68F ; emoji ; L1 ; none ; j # V6.0 (🚏) BUS STOP +1F690 ; emoji ; L1 ; none ; x # V6.0 (🚐) MINIBUS +1F691 ; emoji ; L1 ; none ; j w # V6.0 (🚑) AMBULANCE +1F692 ; emoji ; L1 ; none ; j # V6.0 (🚒) FIRE ENGINE +1F693 ; emoji ; L1 ; none ; j # V6.0 (🚓) POLICE CAR +1F694 ; emoji ; L1 ; none ; w # V6.0 (🚔) ONCOMING POLICE CAR +1F695 ; emoji ; L1 ; none ; j # V6.0 (🚕) TAXI +1F696 ; emoji ; L1 ; none ; x # V6.0 (🚖) ONCOMING TAXI +1F697 ; emoji ; L1 ; none ; j # V6.0 (🚗) AUTOMOBILE +1F698 ; emoji ; L1 ; none ; w # V6.0 (🚘) ONCOMING AUTOMOBILE +1F699 ; emoji ; L1 ; none ; j # V6.0 (🚙) RECREATIONAL VEHICLE +1F69A ; emoji ; L1 ; none ; j # V6.0 (🚚) DELIVERY TRUCK +1F69B ; emoji ; L1 ; none ; x # V6.0 (🚛) ARTICULATED LORRY +1F69C ; emoji ; L1 ; none ; x # V6.0 (🚜) TRACTOR +1F69D ; emoji ; L1 ; none ; x # V6.0 (🚝) MONORAIL +1F69E ; emoji ; L1 ; none ; x # V6.0 (🚞) MOUNTAIN RAILWAY +1F69F ; emoji ; L1 ; none ; x # V6.0 (🚟) SUSPENSION RAILWAY +1F6A0 ; emoji ; L1 ; none ; x # V6.0 (🚠) MOUNTAIN CABLEWAY +1F6A1 ; emoji ; L1 ; none ; x # V6.0 (🚡) AERIAL TRAMWAY +1F6A2 ; emoji ; L1 ; none ; j # V6.0 (🚢) SHIP +1F6A3 ; emoji ; L1 ; secondary ; x # V6.0 (🚣) ROWBOAT +1F6A4 ; emoji ; L1 ; none ; j # V6.0 (🚤) SPEEDBOAT +1F6A5 ; emoji ; L1 ; none ; j # V6.0 (🚥) HORIZONTAL TRAFFIC LIGHT +1F6A6 ; emoji ; L1 ; none ; x # V6.0 (🚦) VERTICAL TRAFFIC LIGHT +1F6A7 ; emoji ; L1 ; none ; j # V6.0 (🚧) CONSTRUCTION SIGN +1F6A8 ; emoji ; L1 ; none ; j # V6.0 (🚨) POLICE CARS REVOLVING LIGHT +1F6A9 ; emoji ; L1 ; none ; j # V6.0 (🚩) TRIANGULAR FLAG ON POST +1F6AA ; emoji ; L1 ; none ; j # V6.0 (🚪) DOOR +1F6AB ; emoji ; L1 ; none ; j # V6.0 (🚫) NO ENTRY SIGN +1F6AC ; emoji ; L1 ; none ; j # V6.0 (🚬) SMOKING SYMBOL +1F6AD ; emoji ; L1 ; none ; j w # V6.0 (🚭) NO SMOKING SYMBOL +1F6AE ; emoji ; L1 ; none ; x # V6.0 (🚮) PUT LITTER IN ITS PLACE SYMBOL +1F6AF ; emoji ; L1 ; none ; x # V6.0 (🚯) DO NOT LITTER SYMBOL +1F6B0 ; emoji ; L1 ; none ; x # V6.0 (🚰) POTABLE WATER SYMBOL +1F6B1 ; emoji ; L1 ; none ; x # V6.0 (🚱) NON-POTABLE WATER SYMBOL +1F6B2 ; emoji ; L1 ; none ; j w # V6.0 (🚲) BICYCLE +1F6B3 ; emoji ; L1 ; none ; x # V6.0 (🚳) NO BICYCLES +1F6B4 ; emoji ; L1 ; secondary ; x # V6.0 (🚴) BICYCLIST +1F6B5 ; emoji ; L1 ; secondary ; x # V6.0 (🚵) MOUNTAIN BICYCLIST +1F6B6 ; emoji ; L1 ; secondary ; j # V6.0 (🚶) PEDESTRIAN +1F6B7 ; emoji ; L1 ; none ; x # V6.0 (🚷) NO PEDESTRIANS +1F6B8 ; emoji ; L1 ; none ; x # V6.0 (🚸) CHILDREN CROSSING +1F6B9 ; emoji ; L1 ; none ; j w # V6.0 (🚹) MENS SYMBOL +1F6BA ; emoji ; L1 ; none ; j w # V6.0 (🚺) WOMENS SYMBOL +1F6BB ; emoji ; L1 ; none ; j # V6.0 (🚻) RESTROOM +1F6BC ; emoji ; L1 ; none ; j w # V6.0 (🚼) BABY SYMBOL +1F6BD ; emoji ; L1 ; none ; j # V6.0 (🚽) TOILET +1F6BE ; emoji ; L1 ; none ; j # V6.0 (🚾) WATER CLOSET +1F6BF ; emoji ; L1 ; none ; x # V6.0 (🚿) SHOWER +1F6C0 ; emoji ; L1 ; secondary ; j # V6.0 (🛀) BATH +1F6C1 ; emoji ; L1 ; none ; x # V6.0 (🛁) BATHTUB +1F6C2 ; emoji ; L1 ; none ; x # V6.0 (🛂) PASSPORT CONTROL +1F6C3 ; emoji ; L1 ; none ; x # V6.0 (🛃) CUSTOMS +1F6C4 ; emoji ; L1 ; none ; x # V6.0 (🛄) BAGGAGE CLAIM +1F6C5 ; emoji ; L1 ; none ; x # V6.0 (🛅) LEFT LUGGAGE +1F6CB ; text ; L2 ; none ; w # V7.0 (🛋) COUCH AND LAMP +1F6CC ; emoji ; L2 ; none ; x # V7.0 (🛌) SLEEPING ACCOMMODATION +1F6CD ; text ; L2 ; none ; w # V7.0 (🛍) SHOPPING BAGS +1F6CE ; text ; L2 ; none ; w # V7.0 (🛎) BELLHOP BELL +1F6CF ; text ; L2 ; none ; w # V7.0 (🛏) BED +1F6D0 ; emoji ; L2 ; none ; x # V8.0 (🛐) PLACE OF WORSHIP +1F6E0 ; text ; L2 ; none ; w # V7.0 (🛠) HAMMER AND WRENCH +1F6E1 ; text ; L2 ; none ; w # V7.0 (🛡) SHIELD +1F6E2 ; text ; L2 ; none ; w # V7.0 (🛢) OIL DRUM +1F6E3 ; text ; L2 ; none ; w # V7.0 (🛣) MOTORWAY +1F6E4 ; text ; L2 ; none ; w # V7.0 (🛤) RAILWAY TRACK +1F6E5 ; text ; L2 ; none ; w # V7.0 (🛥) MOTOR BOAT +1F6E9 ; text ; L2 ; none ; w # V7.0 (🛩) SMALL AIRPLANE +1F6EB ; emoji ; L2 ; none ; x # V7.0 (🛫) AIRPLANE DEPARTURE +1F6EC ; emoji ; L2 ; none ; x # V7.0 (🛬) AIRPLANE ARRIVING +1F6F0 ; text ; L2 ; none ; w # V7.0 (🛰) SATELLITE +1F6F3 ; text ; L2 ; none ; w # V7.0 (🛳) PASSENGER SHIP +1F910 ; emoji ; L2 ; secondary ; x # V8.0 (🤐) ZIPPER-MOUTH FACE +1F911 ; emoji ; L2 ; secondary ; x # V8.0 (🤑) MONEY-MOUTH FACE +1F912 ; emoji ; L2 ; secondary ; x # V8.0 (🤒) FACE WITH THERMOMETER +1F913 ; emoji ; L2 ; secondary ; x # V8.0 (🤓) NERD FACE +1F914 ; emoji ; L2 ; secondary ; x # V8.0 (🤔) THINKING FACE +1F915 ; emoji ; L2 ; secondary ; x # V8.0 (🤕) FACE WITH HEAD-BANDAGE +1F916 ; emoji ; L2 ; none ; x # V8.0 (🤖) ROBOT FACE +1F917 ; emoji ; L2 ; secondary ; x # V8.0 (🤗) HUGGING FACE +1F918 ; emoji ; L2 ; secondary ; x # V8.0 (🤘) SIGN OF THE HORNS +1F980 ; emoji ; L2 ; none ; x # V8.0 (🦀) CRAB +1F981 ; emoji ; L2 ; none ; x # V8.0 (🦁) LION FACE +1F982 ; emoji ; L2 ; none ; x # V8.0 (🦂) SCORPION +1F983 ; emoji ; L2 ; none ; x # V8.0 (🦃) TURKEY +1F984 ; emoji ; L2 ; none ; x # V8.0 (🦄) UNICORN FACE +1F9C0 ; emoji ; L2 ; none ; x # V8.0 (🧀) CHEESE WEDGE +0023 20E3 ; text ; L1 ; none ; j # V3.0 (#⃣) keycap NUMBER SIGN +002A 20E3 ; text ; L2 ; none ; x # V3.0 (*⃣) keycap ASTERISK +0030 20E3 ; text ; L1 ; none ; j # V3.0 (0⃣) keycap DIGIT ZERO +0031 20E3 ; text ; L1 ; none ; j # V3.0 (1⃣) keycap DIGIT ONE +0032 20E3 ; text ; L1 ; none ; j # V3.0 (2⃣) keycap DIGIT TWO +0033 20E3 ; text ; L1 ; none ; j # V3.0 (3⃣) keycap DIGIT THREE +0034 20E3 ; text ; L1 ; none ; j # V3.0 (4⃣) keycap DIGIT FOUR +0035 20E3 ; text ; L1 ; none ; j # V3.0 (5⃣) keycap DIGIT FIVE +0036 20E3 ; text ; L1 ; none ; j # V3.0 (6⃣) keycap DIGIT SIX +0037 20E3 ; text ; L1 ; none ; j # V3.0 (7⃣) keycap DIGIT SEVEN +0038 20E3 ; text ; L1 ; none ; j # V3.0 (8⃣) keycap DIGIT EIGHT +0039 20E3 ; text ; L1 ; none ; j # V3.0 (9⃣) keycap DIGIT NINE +1F1E6 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇦🇨) flag for Ascension Island +1F1E6 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇦🇩) flag for Andorra +1F1E6 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇦🇪) flag for United Arab Emirates +1F1E6 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇦🇫) flag for Afghanistan +1F1E6 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇦🇬) flag for Antigua & Barbuda +1F1E6 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇦🇮) flag for Anguilla +1F1E6 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇦🇱) flag for Albania +1F1E6 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇦🇲) flag for Armenia +1F1E6 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇦🇴) flag for Angola +1F1E6 1F1F6 ; emoji ; L2 ; none ; x # V6.0 (🇦🇶) flag for Antarctica +1F1E6 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇦🇷) flag for Argentina +1F1E6 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇦🇸) flag for American Samoa +1F1E6 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇦🇹) flag for Austria +1F1E6 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇦🇺) flag for Australia +1F1E6 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇦🇼) flag for Aruba +1F1E6 1F1FD ; emoji ; L2 ; none ; x # V6.0 (🇦🇽) flag for Åland Islands +1F1E6 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇦🇿) flag for Azerbaijan +1F1E7 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇧🇦) flag for Bosnia & Herzegovina +1F1E7 1F1E7 ; emoji ; L2 ; none ; x # V6.0 (🇧🇧) flag for Barbados +1F1E7 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇧🇩) flag for Bangladesh +1F1E7 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇧🇪) flag for Belgium +1F1E7 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇧🇫) flag for Burkina Faso +1F1E7 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇧🇬) flag for Bulgaria +1F1E7 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇧🇭) flag for Bahrain +1F1E7 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇧🇮) flag for Burundi +1F1E7 1F1EF ; emoji ; L2 ; none ; x # V6.0 (🇧🇯) flag for Benin +1F1E7 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇧🇱) flag for St. Barthélemy +1F1E7 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇧🇲) flag for Bermuda +1F1E7 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇧🇳) flag for Brunei +1F1E7 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇧🇴) flag for Bolivia +1F1E7 1F1F6 ; emoji ; L2 ; none ; x # V6.0 (🇧🇶) flag for Caribbean Netherlands +1F1E7 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇧🇷) flag for Brazil +1F1E7 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇧🇸) flag for Bahamas +1F1E7 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇧🇹) flag for Bhutan +1F1E7 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇧🇻) flag for Bouvet Island +1F1E7 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇧🇼) flag for Botswana +1F1E7 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇧🇾) flag for Belarus +1F1E7 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇧🇿) flag for Belize +1F1E8 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇨🇦) flag for Canada +1F1E8 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇨🇨) flag for Cocos Islands +1F1E8 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇨🇩) flag for Congo - Kinshasa +1F1E8 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇨🇫) flag for Central African Republic +1F1E8 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇨🇬) flag for Congo - Brazzaville +1F1E8 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇨🇭) flag for Switzerland +1F1E8 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇨🇮) flag for Côte d’Ivoire +1F1E8 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇨🇰) flag for Cook Islands +1F1E8 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇨🇱) flag for Chile +1F1E8 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇨🇲) flag for Cameroon +1F1E8 1F1F3 ; emoji ; L1 ; none ; j # V6.0 (🇨🇳) flag for China +1F1E8 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇨🇴) flag for Colombia +1F1E8 1F1F5 ; emoji ; L2 ; none ; x # V6.0 (🇨🇵) flag for Clipperton Island +1F1E8 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇨🇷) flag for Costa Rica +1F1E8 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇨🇺) flag for Cuba +1F1E8 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇨🇻) flag for Cape Verde +1F1E8 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇨🇼) flag for Curaçao +1F1E8 1F1FD ; emoji ; L2 ; none ; x # V6.0 (🇨🇽) flag for Christmas Island +1F1E8 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇨🇾) flag for Cyprus +1F1E8 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇨🇿) flag for Czech Republic +1F1E9 1F1EA ; emoji ; L1 ; none ; j # V6.0 (🇩🇪) flag for Germany +1F1E9 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇩🇬) flag for Diego Garcia +1F1E9 1F1EF ; emoji ; L2 ; none ; x # V6.0 (🇩🇯) flag for Djibouti +1F1E9 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇩🇰) flag for Denmark +1F1E9 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇩🇲) flag for Dominica +1F1E9 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇩🇴) flag for Dominican Republic +1F1E9 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇩🇿) flag for Algeria +1F1EA 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇪🇦) flag for Ceuta & Melilla +1F1EA 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇪🇨) flag for Ecuador +1F1EA 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇪🇪) flag for Estonia +1F1EA 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇪🇬) flag for Egypt +1F1EA 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇪🇭) flag for Western Sahara +1F1EA 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇪🇷) flag for Eritrea +1F1EA 1F1F8 ; emoji ; L1 ; none ; j # V6.0 (🇪🇸) flag for Spain +1F1EA 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇪🇹) flag for Ethiopia +1F1EA 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇪🇺) flag for European Union +1F1EB 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇫🇮) flag for Finland +1F1EB 1F1EF ; emoji ; L2 ; none ; x # V6.0 (🇫🇯) flag for Fiji +1F1EB 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇫🇰) flag for Falkland Islands +1F1EB 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇫🇲) flag for Micronesia +1F1EB 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇫🇴) flag for Faroe Islands +1F1EB 1F1F7 ; emoji ; L1 ; none ; j # V6.0 (🇫🇷) flag for France +1F1EC 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇬🇦) flag for Gabon +1F1EC 1F1E7 ; emoji ; L1 ; none ; j # V6.0 (🇬🇧) flag for United Kingdom +1F1EC 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇬🇩) flag for Grenada +1F1EC 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇬🇪) flag for Georgia +1F1EC 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇬🇫) flag for French Guiana +1F1EC 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇬🇬) flag for Guernsey +1F1EC 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇬🇭) flag for Ghana +1F1EC 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇬🇮) flag for Gibraltar +1F1EC 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇬🇱) flag for Greenland +1F1EC 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇬🇲) flag for Gambia +1F1EC 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇬🇳) flag for Guinea +1F1EC 1F1F5 ; emoji ; L2 ; none ; x # V6.0 (🇬🇵) flag for Guadeloupe +1F1EC 1F1F6 ; emoji ; L2 ; none ; x # V6.0 (🇬🇶) flag for Equatorial Guinea +1F1EC 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇬🇷) flag for Greece +1F1EC 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇬🇸) flag for South Georgia & South Sandwich Islands +1F1EC 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇬🇹) flag for Guatemala +1F1EC 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇬🇺) flag for Guam +1F1EC 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇬🇼) flag for Guinea-Bissau +1F1EC 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇬🇾) flag for Guyana +1F1ED 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇭🇰) flag for Hong Kong +1F1ED 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇭🇲) flag for Heard & McDonald Islands +1F1ED 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇭🇳) flag for Honduras +1F1ED 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇭🇷) flag for Croatia +1F1ED 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇭🇹) flag for Haiti +1F1ED 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇭🇺) flag for Hungary +1F1EE 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇮🇨) flag for Canary Islands +1F1EE 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇮🇩) flag for Indonesia +1F1EE 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇮🇪) flag for Ireland +1F1EE 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇮🇱) flag for Israel +1F1EE 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇮🇲) flag for Isle of Man +1F1EE 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇮🇳) flag for India +1F1EE 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇮🇴) flag for British Indian Ocean Territory +1F1EE 1F1F6 ; emoji ; L2 ; none ; x # V6.0 (🇮🇶) flag for Iraq +1F1EE 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇮🇷) flag for Iran +1F1EE 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇮🇸) flag for Iceland +1F1EE 1F1F9 ; emoji ; L1 ; none ; j # V6.0 (🇮🇹) flag for Italy +1F1EF 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇯🇪) flag for Jersey +1F1EF 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇯🇲) flag for Jamaica +1F1EF 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇯🇴) flag for Jordan +1F1EF 1F1F5 ; emoji ; L1 ; none ; j # V6.0 (🇯🇵) flag for Japan +1F1F0 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇰🇪) flag for Kenya +1F1F0 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇰🇬) flag for Kyrgyzstan +1F1F0 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇰🇭) flag for Cambodia +1F1F0 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇰🇮) flag for Kiribati +1F1F0 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇰🇲) flag for Comoros +1F1F0 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇰🇳) flag for St. Kitts & Nevis +1F1F0 1F1F5 ; emoji ; L2 ; none ; x # V6.0 (🇰🇵) flag for North Korea +1F1F0 1F1F7 ; emoji ; L1 ; none ; j # V6.0 (🇰🇷) flag for South Korea +1F1F0 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇰🇼) flag for Kuwait +1F1F0 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇰🇾) flag for Cayman Islands +1F1F0 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇰🇿) flag for Kazakhstan +1F1F1 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇱🇦) flag for Laos +1F1F1 1F1E7 ; emoji ; L2 ; none ; x # V6.0 (🇱🇧) flag for Lebanon +1F1F1 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇱🇨) flag for St. Lucia +1F1F1 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇱🇮) flag for Liechtenstein +1F1F1 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇱🇰) flag for Sri Lanka +1F1F1 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇱🇷) flag for Liberia +1F1F1 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇱🇸) flag for Lesotho +1F1F1 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇱🇹) flag for Lithuania +1F1F1 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇱🇺) flag for Luxembourg +1F1F1 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇱🇻) flag for Latvia +1F1F1 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇱🇾) flag for Libya +1F1F2 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇲🇦) flag for Morocco +1F1F2 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇲🇨) flag for Monaco +1F1F2 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇲🇩) flag for Moldova +1F1F2 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇲🇪) flag for Montenegro +1F1F2 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇲🇫) flag for St. Martin +1F1F2 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇲🇬) flag for Madagascar +1F1F2 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇲🇭) flag for Marshall Islands +1F1F2 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇲🇰) flag for Macedonia +1F1F2 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇲🇱) flag for Mali +1F1F2 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇲🇲) flag for Myanmar +1F1F2 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇲🇳) flag for Mongolia +1F1F2 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇲🇴) flag for Macau +1F1F2 1F1F5 ; emoji ; L2 ; none ; x # V6.0 (🇲🇵) flag for Northern Mariana Islands +1F1F2 1F1F6 ; emoji ; L2 ; none ; x # V6.0 (🇲🇶) flag for Martinique +1F1F2 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇲🇷) flag for Mauritania +1F1F2 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇲🇸) flag for Montserrat +1F1F2 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇲🇹) flag for Malta +1F1F2 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇲🇺) flag for Mauritius +1F1F2 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇲🇻) flag for Maldives +1F1F2 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇲🇼) flag for Malawi +1F1F2 1F1FD ; emoji ; L2 ; none ; x # V6.0 (🇲🇽) flag for Mexico +1F1F2 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇲🇾) flag for Malaysia +1F1F2 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇲🇿) flag for Mozambique +1F1F3 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇳🇦) flag for Namibia +1F1F3 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇳🇨) flag for New Caledonia +1F1F3 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇳🇪) flag for Niger +1F1F3 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇳🇫) flag for Norfolk Island +1F1F3 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇳🇬) flag for Nigeria +1F1F3 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇳🇮) flag for Nicaragua +1F1F3 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇳🇱) flag for Netherlands +1F1F3 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇳🇴) flag for Norway +1F1F3 1F1F5 ; emoji ; L2 ; none ; x # V6.0 (🇳🇵) flag for Nepal +1F1F3 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇳🇷) flag for Nauru +1F1F3 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇳🇺) flag for Niue +1F1F3 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇳🇿) flag for New Zealand +1F1F4 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇴🇲) flag for Oman +1F1F5 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇵🇦) flag for Panama +1F1F5 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇵🇪) flag for Peru +1F1F5 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇵🇫) flag for French Polynesia +1F1F5 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇵🇬) flag for Papua New Guinea +1F1F5 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇵🇭) flag for Philippines +1F1F5 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇵🇰) flag for Pakistan +1F1F5 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇵🇱) flag for Poland +1F1F5 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇵🇲) flag for St. Pierre & Miquelon +1F1F5 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇵🇳) flag for Pitcairn Islands +1F1F5 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇵🇷) flag for Puerto Rico +1F1F5 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇵🇸) flag for Palestinian Territories +1F1F5 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇵🇹) flag for Portugal +1F1F5 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇵🇼) flag for Palau +1F1F5 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇵🇾) flag for Paraguay +1F1F6 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇶🇦) flag for Qatar +1F1F7 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇷🇪) flag for Réunion +1F1F7 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇷🇴) flag for Romania +1F1F7 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇷🇸) flag for Serbia +1F1F7 1F1FA ; emoji ; L1 ; none ; j # V6.0 (🇷🇺) flag for Russia +1F1F7 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇷🇼) flag for Rwanda +1F1F8 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇸🇦) flag for Saudi Arabia +1F1F8 1F1E7 ; emoji ; L2 ; none ; x # V6.0 (🇸🇧) flag for Solomon Islands +1F1F8 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇸🇨) flag for Seychelles +1F1F8 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇸🇩) flag for Sudan +1F1F8 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇸🇪) flag for Sweden +1F1F8 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇸🇬) flag for Singapore +1F1F8 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇸🇭) flag for St. Helena +1F1F8 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇸🇮) flag for Slovenia +1F1F8 1F1EF ; emoji ; L2 ; none ; x # V6.0 (🇸🇯) flag for Svalbard & Jan Mayen +1F1F8 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇸🇰) flag for Slovakia +1F1F8 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇸🇱) flag for Sierra Leone +1F1F8 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇸🇲) flag for San Marino +1F1F8 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇸🇳) flag for Senegal +1F1F8 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇸🇴) flag for Somalia +1F1F8 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇸🇷) flag for Suriname +1F1F8 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇸🇸) flag for South Sudan +1F1F8 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇸🇹) flag for São Tomé & Príncipe +1F1F8 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇸🇻) flag for El Salvador +1F1F8 1F1FD ; emoji ; L2 ; none ; x # V6.0 (🇸🇽) flag for Sint Maarten +1F1F8 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇸🇾) flag for Syria +1F1F8 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇸🇿) flag for Swaziland +1F1F9 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇹🇦) flag for Tristan da Cunha +1F1F9 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇹🇨) flag for Turks & Caicos Islands +1F1F9 1F1E9 ; emoji ; L2 ; none ; x # V6.0 (🇹🇩) flag for Chad +1F1F9 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇹🇫) flag for French Southern Territories +1F1F9 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇹🇬) flag for Togo +1F1F9 1F1ED ; emoji ; L2 ; none ; x # V6.0 (🇹🇭) flag for Thailand +1F1F9 1F1EF ; emoji ; L2 ; none ; x # V6.0 (🇹🇯) flag for Tajikistan +1F1F9 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇹🇰) flag for Tokelau +1F1F9 1F1F1 ; emoji ; L2 ; none ; x # V6.0 (🇹🇱) flag for Timor-Leste +1F1F9 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇹🇲) flag for Turkmenistan +1F1F9 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇹🇳) flag for Tunisia +1F1F9 1F1F4 ; emoji ; L2 ; none ; x # V6.0 (🇹🇴) flag for Tonga +1F1F9 1F1F7 ; emoji ; L2 ; none ; x # V6.0 (🇹🇷) flag for Turkey +1F1F9 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇹🇹) flag for Trinidad & Tobago +1F1F9 1F1FB ; emoji ; L2 ; none ; x # V6.0 (🇹🇻) flag for Tuvalu +1F1F9 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇹🇼) flag for Taiwan +1F1F9 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇹🇿) flag for Tanzania +1F1FA 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇺🇦) flag for Ukraine +1F1FA 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇺🇬) flag for Uganda +1F1FA 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇺🇲) flag for U.S. Outlying Islands +1F1FA 1F1F8 ; emoji ; L1 ; none ; j # V6.0 (🇺🇸) flag for United States +1F1FA 1F1FE ; emoji ; L2 ; none ; x # V6.0 (🇺🇾) flag for Uruguay +1F1FA 1F1FF ; emoji ; L2 ; none ; x # V6.0 (🇺🇿) flag for Uzbekistan +1F1FB 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇻🇦) flag for Vatican City +1F1FB 1F1E8 ; emoji ; L2 ; none ; x # V6.0 (🇻🇨) flag for St. Vincent & Grenadines +1F1FB 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇻🇪) flag for Venezuela +1F1FB 1F1EC ; emoji ; L2 ; none ; x # V6.0 (🇻🇬) flag for British Virgin Islands +1F1FB 1F1EE ; emoji ; L2 ; none ; x # V6.0 (🇻🇮) flag for U.S. Virgin Islands +1F1FB 1F1F3 ; emoji ; L2 ; none ; x # V6.0 (🇻🇳) flag for Vietnam +1F1FB 1F1FA ; emoji ; L2 ; none ; x # V6.0 (🇻🇺) flag for Vanuatu +1F1FC 1F1EB ; emoji ; L2 ; none ; x # V6.0 (🇼🇫) flag for Wallis & Futuna +1F1FC 1F1F8 ; emoji ; L2 ; none ; x # V6.0 (🇼🇸) flag for Samoa +1F1FD 1F1F0 ; emoji ; L2 ; none ; x # V6.0 (🇽🇰) flag for Kosovo +1F1FE 1F1EA ; emoji ; L2 ; none ; x # V6.0 (🇾🇪) flag for Yemen +1F1FE 1F1F9 ; emoji ; L2 ; none ; x # V6.0 (🇾🇹) flag for Mayotte +1F1FF 1F1E6 ; emoji ; L2 ; none ; x # V6.0 (🇿🇦) flag for South Africa +1F1FF 1F1F2 ; emoji ; L2 ; none ; x # V6.0 (🇿🇲) flag for Zambia +1F1FF 1F1FC ; emoji ; L2 ; none ; x # V6.0 (🇿🇼) flag for Zimbabwe diff --git a/plugins/emoji/emoji.plugin.zsh b/plugins/emoji/emoji.plugin.zsh new file mode 100644 index 000000000..7876f1c89 --- /dev/null +++ b/plugins/emoji/emoji.plugin.zsh @@ -0,0 +1,288 @@ +# emoji plugin +# +# Makes emoji support available within ZSH +# +# See the README for documentation. + +_omz_emoji_plugin_dir="${0:h}" + +() { + +local LC_ALL=en_US.UTF-8 + +typeset -gAH emoji_groups +typeset -gAH emoji_con +typeset -gAH emoji2 +typeset -gAH emoji_skintone + +source "$_omz_emoji_plugin_dir/emoji-char-definitions.zsh" +unset _omz_emoji_plugin_dir + +# These additional emoji are not in the definition file, but are useful in conjunction with it + +# This is a combinin character that can be placed after any other character to surround +# it in a "keycap" symbol. +# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. +# It's unclear whether this should be in the $emoji array, because those characters are all ones +# which can be displayed on their own. +#emoji[combining_enclosing_keycap]="\U20E3" + +emoji[regional_indicator_symbol_letter_d_regional_indicator_symbol_letter_e]=$'\xF0\x9F\x87\xA9\xF0\x9F\x87\xAA' +emoji[regional_indicator_symbol_letter_g_regional_indicator_symbol_letter_b]=$'\xF0\x9F\x87\xAC\xF0\x9F\x87\xA7' +emoji[regional_indicator_symbol_letter_c_regional_indicator_symbol_letter_n]=$'\xF0\x9F\x87\xA8\xF0\x9F\x87\xB3' +emoji[regional_indicator_symbol_letter_j_regional_indicator_symbol_letter_p]=$'\xF0\x9F\x87\xAF\xF0\x9F\x87\xB5' +emoji[regional_indicator_symbol_letter_k_regional_indicator_symbol_letter_r]=$'\xF0\x9F\x87\xB0\xF0\x9F\x87\xB7' +emoji[regional_indicator_symbol_letter_f_regional_indicator_symbol_letter_r]=$'\xF0\x9F\x87\xAB\xF0\x9F\x87\xB7' +emoji[regional_indicator_symbol_letter_e_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xAA\xF0\x9F\x87\xB8' +emoji[regional_indicator_symbol_letter_i_regional_indicator_symbol_letter_t]=$'\xF0\x9F\x87\xAE\xF0\x9F\x87\xB9' +emoji[regional_indicator_symbol_letter_u_regional_indicator_symbol_letter_s]=$'\xF0\x9F\x87\xBA\xF0\x9F\x87\xB8' +emoji[regional_indicator_symbol_letter_r_regional_indicator_symbol_letter_u]=$'\xF0\x9F\x87\xB7\xF0\x9F\x87\xBA' + +# Nonstandard alias names +emoji[vulcan_salute]=$'\U1F596' + + +# Emoji combining and auxiliary characters + +# "Variation Selectors" for controlling text vs emoji style presentation +# These apply to the immediately preceding character +emoji2[text_style]=$'\UFE0E' +emoji2[emoji_style]=$'\UFE0F' +# Joiner that indicates a single combined-form glyph (ligature) should be used +emoji2[zero_width_joiner]=$'\U200D' +# Skin tone modifiers +emoji2[emoji_modifier_fitzpatrick_type_1_2]=$'\U1F3FB' +emoji2[emoji_modifier_fitzpatrick_type_3]=$'\U1F3FC' +emoji2[emoji_modifier_fitzpatrick_type_4]=$'\U1F3FD' +emoji2[emoji_modifier_fitzpatrick_type_5]=$'\U1F3FE' +emoji2[emoji_modifier_fitzpatrick_type_6]=$'\U1F3FF' +# Various other combining characters. (Incomplete list; I selected ones that sound useful) +emoji2[combining_enclosing_circle]=$'\U20DD' +emoji2[combining_enclosing_square]=$'\U20DE' +emoji2[combining_enclosing_diamond]=$'\U20DF' +emoji2[combining_enclosing_circle_backslash]=$'\U20E0' +emoji2[combining_enclosing_screen]=$'\U20E2' +emoji2[combining_enclosing_keycap]=$'\U20E3' +emoji2[combining_enclosing_upward_pointing_triangle]=$'\U20E4' + +# Easier access to skin tone modifiers +emoji_skintone[1_2]=$'\U1F3FB' +emoji_skintone[3]=$'\U1F3FC' +emoji_skintone[4]=$'\U1F3FD' +emoji_skintone[5]=$'\U1F3FE' +emoji_skintone[6]=$'\U1F3FF' + +# Emoji groups +# 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. + +emoji_groups[fruits]=" + tomato + aubergine + grapes + melon + watermelon + tangerine + banana + pineapple + red_apple + green_apple + peach + cherries + strawberry + lemon + pear +" + +emoji_groups[vehicles]=" + airplane + rocket + railway_car + high_speed_train + high_speed_train_with_bullet_nose + bus + ambulance + fire_engine + police_car + taxi + automobile + recreational_vehicle + delivery_truck + ship + speedboat + bicycle + helicopter + steam_locomotive + train + light_rail + tram + oncoming_bus + trolleybus + minibus + oncoming_police_car + oncoming_taxi + oncoming_automobile + articulated_lorry + tractor + monorail + mountain_railway + suspension_railway + mountain_cableway + aerial_tramway + rowboat + bicyclist + mountain_bicyclist + sailboat +" + +emoji_groups[animals]=" + snail + snake + horse + sheep + monkey + chicken + boar + elephant + octopus + spiral_shell + bug + ant + honeybee + lady_beetle + fish + tropical_fish + blowfish + turtle + hatching_chick + baby_chick + front_facing_baby_chick + bird + penguin + koala + poodle + bactrian_camel + dolphin + mouse_face + cow_face + tiger_face + rabbit_face + cat_face + dragon_face + spouting_whale + horse_face + monkey_face + dog_face + pig_face + frog_face + hamster_face + wolf_face + bear_face + panda_face + rat + mouse + ox + water_buffalo + cow + tiger + leopard + rabbit + cat + dragon + crocodile + whale + ram + goat + rooster + dog + pig + dromedary_camel +" + +emoji_groups[faces]=" + grinning_face_with_smiling_eyes + face_with_tears_of_joy + smiling_face_with_open_mouth + smiling_face_with_open_mouth_and_smiling_eyes + smiling_face_with_open_mouth_and_cold_sweat + smiling_face_with_open_mouth_and_tightly_closed_eyes + winking_face + smiling_face_with_smiling_eyes + face_savouring_delicious_food + relieved_face + smiling_face_with_heart_shaped_eyes + smirking_face + unamused_face + face_with_cold_sweat + pensive_face + confounded_face + face_throwing_a_kiss + kissing_face_with_closed_eyes + face_with_stuck_out_tongue_and_winking_eye + face_with_stuck_out_tongue_and_tightly_closed_eyes + disappointed_face + angry_face + pouting_face + crying_face + persevering_face + face_with_look_of_triumph + disappointed_but_relieved_face + fearful_face + weary_face + sleepy_face + tired_face + loudly_crying_face + face_with_open_mouth_and_cold_sweat + face_screaming_in_fear + astonished_face + flushed_face + dizzy_face + face_with_medical_mask +" + +} + +# Prints a random emoji character +# +# random_emoji [group] +# +function random_emoji() { + local group=$1 + local names + if [[ -z "$group" || "$group" == "all" ]]; then + names=(${(k)emoji}) + else + names=(${=emoji_groups[$group]}) + fi + 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]} +} + +# Displays a listing of emoji with their names +# +# display_emoji [group] +# +function display_emoji() { + local group=$1 + local names + if [[ -z "$group" || "$group" == "all" ]]; then + names=(${(k)emoji}) + else + names=(${=emoji_groups[$group]}) + fi + # The extra spaces in output here are a hack for readability, since some + # terminals treat these emoji chars as single-width. + for i in $names; do + printf '%s ' "$emoji[$i]" + done + print + for i in $names; do + echo "${emoji[$i]} = $i" + done +} + + diff --git a/plugins/emoji/update_emoji.pl b/plugins/emoji/update_emoji.pl new file mode 100644 index 000000000..04f3ce8e7 --- /dev/null +++ b/plugins/emoji/update_emoji.pl @@ -0,0 +1,113 @@ +#!/usr/bin/perl -w +# +# update_emoji.pl +# +# This script generates the emoji.plugin.zsh emoji definitions from the Unicode +# character data for the emoji characters. +# +# The data file can be found at http://unicode.org/Public/emoji/latest/emoji-data.txt +# as referenced in Unicode TR51 (http://www.unicode.org/reports/tr51/index.html). +# +# This is known to work with the data file from version 1.0. It may not work with later +# versions if the format changes. In particular, this reads line comments to get the +# emoji character name and unicode version. +# +# Country names have punctuation and other non-letter characters removed from their name, +# to avoid possible complications with having to escape the strings when using them as +# array subscripts. The definition file seems to use some combining characters like accents +# that get stripped during this process. + +use strict; +use warnings; +use 5.010; +use autodie; + +use Path::Class; +use File::Copy; + +# Parse definitions out of the data file and convert +sub process_emoji_data_file { + my ( $infile, $outfilename ) = @_; + my $file = file($infile); + my $outfile = file($outfilename); + my $outfilebase = $outfile->basename(); + my $tempfilename = "$outfilename.tmp"; + my $tempfile = file($tempfilename); + my $outfh = $tempfile->openw(); + $outfh->print(" +# $outfilebase - Emoji character definitions for oh-my-zsh emoji plugin +# +# This file is auto-generated by update_emoji.pl. Do not edit it manually. +# +# This contains the definition for: +# \$emoji - which maps character names to Unicode characters +# \$emoji_flags - maps country names to Unicode flag characters using region indicators + +# Main emoji +typeset -gAH emoji +# National flags +typeset -gAH emoji_flags +# Combining modifiers +typeset -gAH emoji_mod + +"); + + my $fh = $file->openr(); + my $line_num = 0; + while ( my $line = $fh->getline() ) { + $line_num++; + $_ = $line; + # Skip all-comment lines (from the header) and blank lines + # (But don't strip comments on normal lines; we need to parse those for + # the emoji names.) + next if /^\s*#/ or /^\s*$/; + + if (/^(\S.*?\S)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w+)\s*;\s*(\w.*?)\s*#\s*V(\S+)\s\(.*?\)\s*(\w.*\S)\s*$/) { + my ($code, $style, $level, $modifier_status, $sources, $version, $keycap_name) + = ($1, $2, $3, $4, $5, $6, $7); + #print "code=$code style=$style level=$level modifier_status=$modifier_status sources=$sources version=$version name=$keycap_name\n"; + my @code_points = split /\s+/, $code; + my @sources = split /\s+/, $sources; + + my $flag_country = ""; + if ( $keycap_name =~ /^flag for (\S.*?)\s*$/) { + $flag_country = $1; + } + + my $zsh_code = join '', map { "\\U$_" } @code_points; + # Convert keycap names to valid associative array names that do not require any + # quoting. Works fine for most stuff, but is clumsy for flags. + my $omz_name = lc($keycap_name); + $omz_name =~ s/[^A-Za-z0-9]/_/g; + my $zsh_flag_country = $flag_country; + $zsh_flag_country =~ s/[^\p{Letter}]/_/g; + if ($flag_country) { + $outfh->print("emoji_flags[$zsh_flag_country]=\$'$zsh_code'\n"); + } else { + $outfh->print("emoji[$omz_name]=\$'$zsh_code'\n"); + } + # Modifiers are included in both the main set and their separate map, + # because they have a standalone representation as a color swatch. + if ( $modifier_status eq "modifier" ) { + $outfh->print("emoji_mod[$omz_name]=\$'$zsh_code'\n"); + } + } else { + die "Failed parsing line $line_num: '$_'"; + } + } + $fh->close(); + $outfh->print("\n"); + $outfh->close(); + + move($tempfilename, $outfilename) + or die "Failed moving temp file to $outfilename: $!"; +} + +my $datafile = "emoji-data.txt"; +my $zsh_def_file = "emoji-char-definitions.zsh"; +process_emoji_data_file($datafile, $zsh_def_file); + +print "Updated definition file $zsh_def_file\n"; + + + diff --git a/plugins/extract/_extract b/plugins/extract/_extract index dca890954..387b344bc 100644 --- a/plugins/extract/_extract +++ b/plugins/extract/_extract @@ -3,6 +3,6 @@ _arguments \ '(-r --remove)'{-r,--remove}'[Remove archive.]' \ - "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|rar|7z|deb)(-.)'" && return 0 + "*::archive file:_files -g '(#i)*.(tar|tgz|tbz|tbz2|txz|tlz|gz|bz2|xz|lzma|Z|zip|ipsw|rar|7z|deb)(-.)'" && return 0 diff --git a/plugins/extract/extract.plugin.zsh b/plugins/extract/extract.plugin.zsh index 898d3d36e..690126ba6 100644 --- a/plugins/extract/extract.plugin.zsh +++ b/plugins/extract/extract.plugin.zsh @@ -23,7 +23,7 @@ function extract() { remove_archive=1 if [[ "$1" == "-r" ]] || [[ "$1" == "--remove" ]]; then - remove_archive=0 + remove_archive=0 shift fi @@ -52,7 +52,7 @@ function extract() { (*.xz) unxz "$1" ;; (*.lzma) unlzma "$1" ;; (*.Z) uncompress "$1" ;; - (*.zip|*.war|*.jar|*.sublime-package) unzip "$1" -d $extract_dir ;; + (*.zip|*.war|*.jar|*.sublime-package|*.ipsw) unzip "$1" -d $extract_dir ;; (*.rar) unrar x -ad "$1" ;; (*.7z) 7za x "$1" ;; (*.deb) @@ -64,10 +64,10 @@ function extract() { cd ..; rm *.tar.gz debian-binary cd .. ;; - (*) + (*) echo "extract: '$1' cannot be extracted" 1>&2 - success=1 - ;; + success=1 + ;; esac (( success = $success > 0 ? $success : $? )) diff --git a/plugins/fasd/fasd.plugin.zsh b/plugins/fasd/fasd.plugin.zsh index 8ad43fc23..b11f0b511 100644 --- a/plugins/fasd/fasd.plugin.zsh +++ b/plugins/fasd/fasd.plugin.zsh @@ -1,11 +1,11 @@ if [ $commands[fasd] ]; then # check if fasd is installed - fasd_cache="$HOME/.fasd-init-cache" + fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache" if [ "$(command -v fasd)" -nt "$fasd_cache" -o ! -s "$fasd_cache" ]; then fasd --init auto >| "$fasd_cache" fi source "$fasd_cache" unset fasd_cache + alias v='f -e vim' - alias o='a -e open' + alias o='a -e open_command' fi - diff --git a/plugins/fbterm/fbterm.plugin.zsh b/plugins/fbterm/fbterm.plugin.zsh index 4f0456016..bc2532092 100644 --- a/plugins/fbterm/fbterm.plugin.zsh +++ b/plugins/fbterm/fbterm.plugin.zsh @@ -1,6 +1,7 @@ # start fbterm automatically in /dev/tty* -if [[ $(tty|grep -o '/dev/tty') = /dev/tty ]] ; then - fbterm - exit +if (( ${+commands[fbterm]} )); then + if [[ "$TTY" = /dev/tty* ]] ; then + fbterm && exit + fi fi diff --git a/plugins/forklift/README.md b/plugins/forklift/README.md new file mode 100644 index 000000000..b452a357c --- /dev/null +++ b/plugins/forklift/README.md @@ -0,0 +1,13 @@ +## forklift + +Plugin for ForkLift, an FTP application for OS X. + +### Requirements + +* [ForkLift](http://forkliftapp.com/forklift/) + +### Usage + +* If `fl` is called without arguments then the current folder is opened in ForkLift. Is equivalent to `fl .` + +* If `fl` is called with a directory as the argument, then that directory is opened in ForkLift
\ No newline at end of file diff --git a/plugins/frontend-search/README.md b/plugins/frontend-search/README.md index 801d450f3..d0bc5589f 100644 --- a/plugins/frontend-search/README.md +++ b/plugins/frontend-search/README.md @@ -1,74 +1,60 @@ -## Rationale ## +## Introduction ## -> Searches for your Frontend contents more easier +> Searches for your frontend web development made easier -## Instalation ## +## Installation ## +Open your `~/.zshrc` file and enable the `frontend-search` plugin: -Open your `.zshrc` file and load `frontend-search` plugin +```zsh + +plugins=( ... frontend-search) -```bash -... -plugins=( <your-plugins-list>... frontend-search) -... ``` -## Commands ## - -All command searches are accept only in format - -* `frontend <search-content> <search-term>` - -The search content are - -* `jquery <api.jquery.com>` -* `mdn <developer.mozilla.org>` -* `compass <compass-style.org>` -* `html5please <html5please.com>` -* `caniuse <caniuse.com>` -* `aurajs <aurajs.com>` -* `dartlang <api.dartlang.org/apidocs/channels/stable/dartdoc-viewer>` -* `lodash <search>` -* `qunit <api.qunitjs.com>` -* `fontello <fontello.com>` -* `bootsnipp <bootsnipp.com>` -* `cssflow <cssflow.com>` -* `codepen <codepen.io>` -* `unheap <www.unheap.com>` -* `bem <google.com/search?as_q=<search-term>&as_sitesearch=bem.info>` -* `smacss <google.com/search?as_q=<search-term>&as_sitesearch=smacss.com>` -* `angularjs <google.com/search?as_q=<search-term>&as_sitesearch=angularjs.org>` -* `reactjs <google.com/search?as_q=<search-term>&as_sitesearch=facebook.github.io/react>` -* `emberjs <emberjs.com>` -* `stackoverflow <stackoverflow.com>` - - -## Aliases ## - -There are a few aliases presented as well: - -* `jquery` A shorthand for `frontend jquery` -* `mdn` A shorthand for `frontend mdn` -* `compass` A shorthand for `frontend compass` -* `html5please` A shorthand for `frontend html5please` -* `caniuse` A shorthand for `frontend caniuse` -* `aurajs` A shorthand for `frontend aurajs` -* `dartlang` A shorthand for `frontend dartlang` -* `lodash` A shorthand for `frontend lodash` -* `qunit` A shorthand for `frontend qunit` -* `fontello` A shorthand for `frontend fontello` -* `bootsnipp` A shorthand for `frontend bootsnipp` -* `cssflow` A shorthand for `frontend cssflow` -* `codepen` A shorthand for `frontend codepen` -* `unheap` A shorthand for `frontend unheap` -* `bem` A shorthand for `frontend bem` -* `smacss` A shorthand for `frontend smacss` -* `angularjs` A shorthand for `frontend angularjs` -* `reactjs` A shorthand for `frontend reactjs` -* `emberjs` A shorthand for `frontend emberjs` -* `stackoverflow` A shorthand for `frontend stackoverflow` +## Usage ## + +You can use the frontend-search plugin in these two forms: + +* `frontend <context> <term> [more terms if you want]` +* `<context> <term> [more terms if you want]` + +For example, these two are equivalent: + +```zsh +$ frontend angularjs dependency injection +$ angularjs dependency injection +``` + +Available search contexts are: + +| context | URL | +|---------------|--------------------------------------------------------------------------| +| angularjs | `https://google.com/search?as_sitesearch=angularjs.org&as_q=` | +| aurajs | `http://aurajs.com/api/#stq=` | +| bem | `https://google.com/search?as_sitesearch=bem.info&as_q=` | +| bootsnipp | `http://bootsnipp.com/search?q=` | +| caniuse | `http://caniuse.com/#search=` | +| codepen | `http://codepen.io/search?q=` | +| compass | `http://compass-style.org/search?q=` | +| cssflow | `http://www.cssflow.com/search?q=` | +| dartlang | `https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:` | +| emberjs | `http://emberjs.com/api/#stp=1&stq=` | +| fontello | `http://fontello.com/#search=` | +| html5please | `http://html5please.com/#` | +| jquery | `https://api.jquery.com/?s=` | +| lodash | `https://devdocs.io/lodash/index#` | +| mdn | `https://developer.mozilla.org/search?q=` | +| npmjs | `https://www.npmjs.com/search?q=` | +| qunit | `https://api.qunitjs.com/?s=` | +| reactjs | `https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=` | +| smacss | `https://google.com/search?as_sitesearch=smacss.com&as_q=` | +| stackoverflow | `http://stackoverflow.com/search?q=` | +| unheap | `http://www.unheap.com/?s=` | + +If you want to have another context, open an Issue and tell us! ## Author @@ -77,5 +63,3 @@ There are a few aliases presented as well: + <https://plus.google.com/+WilsonMendes> + <https://twitter.com/willmendesneto> + <http://github.com/willmendesneto> - -New features comming soon. diff --git a/plugins/frontend-search/_frontend-search.sh b/plugins/frontend-search/_frontend-search.sh index 252f21570..b12f829a1 100644 --- a/plugins/frontend-search/_frontend-search.sh +++ b/plugins/frontend-search/_frontend-search.sh @@ -37,6 +37,7 @@ function _frontend() { 'reactjs: Search in React website' 'emberjs: Search in Ember website' 'stackoverflow: Search in StackOverflow website' + 'npmjs: Search in NPMJS website' ) _arguments -C \ @@ -110,6 +111,9 @@ function _frontend() { stackoverflow) _describe -t points "Warp points" frontend_points && ret=0 ;; + npmjs) + _describe -t points "Warp points" frontend_points && ret=0 + ;; esac ;; esac diff --git a/plugins/frontend-search/frontend-search.plugin.zsh b/plugins/frontend-search/frontend-search.plugin.zsh index b9fb8634c..2fd5416b3 100644 --- a/plugins/frontend-search/frontend-search.plugin.zsh +++ b/plugins/frontend-search/frontend-search.plugin.zsh @@ -1,158 +1,91 @@ -# frontend from terminal +alias angularjs='frontend angularjs' +alias aurajs='frontend aurajs' +alias bem='frontend bem' +alias bootsnipp='frontend bootsnipp' +alias caniuse='frontend caniuse' +alias codepen='frontend codepen' +alias compass='frontend compass' +alias cssflow='frontend cssflow' +alias dartlang='frontend dartlang' +alias emberjs='frontend emberjs' +alias fontello='frontend fontello' +alias html5please='frontend html5please' +alias jquery='frontend jquery' +alias lodash='frontend lodash' +alias mdn='frontend mdn' +alias npmjs='frontend npmjs' +alias qunit='frontend qunit' +alias reactjs='frontend reactjs' +alias smacss='frontend smacss' +alias stackoverflow='frontend stackoverflow' +alias unheap='frontend unheap' function frontend() { - - # get the open command - local open_cmd - if [[ $(uname -s) == 'Darwin' ]]; then - open_cmd='open' - else - open_cmd='xdg-open' - fi - - # no keyword provided, simply show how call methods - if [[ $# -le 1 ]]; then - echo "Please provide a search-content and a search-term for app.\nEx:\nfrontend <search-content> <search-term>\n" - return 1 + emulate -L zsh + + # define search context URLS + typeset -A urls + urls=( + angularjs 'https://google.com/search?as_sitesearch=angularjs.org&as_q=' + aurajs 'http://aurajs.com/api/#stq=' + bem 'https://google.com/search?as_sitesearch=bem.info&as_q=' + bootsnipp 'http://bootsnipp.com/search?q=' + caniuse 'http://caniuse.com/#search=' + codepen 'http://codepen.io/search?q=' + compass 'http://compass-style.org/search?q=' + cssflow 'http://www.cssflow.com/search?q=' + dartlang 'https://api.dartlang.org/apidocs/channels/stable/dartdoc-viewer/dart:' + emberjs 'http://emberjs.com/api/#stp=1&stq=' + fontello 'http://fontello.com/#search=' + html5please 'http://html5please.com/#' + jquery 'https://api.jquery.com/?s=' + lodash 'https://devdocs.io/lodash/index#' + mdn 'https://developer.mozilla.org/search?q=' + npmjs 'https://www.npmjs.com/search?q=' + qunit 'https://api.qunitjs.com/?s=' + reactjs 'https://google.com/search?as_sitesearch=facebook.github.io/react&as_q=' + smacss 'https://google.com/search?as_sitesearch=smacss.com&as_q=' + stackoverflow 'http://stackoverflow.com/search?q=' + unheap 'http://www.unheap.com/?s=' + ) + + # show help for command list + if [[ $# -lt 2 ]] + then + print -P "Usage: frontend %Ucontext%u %Uterm%u [...%Umore%u] (or just: %Ucontext%u %Uterm%u [...%Umore%u])" + print -P "" + print -P "%Uterm%u and what follows is what will be searched for in the %Ucontext%u website," + print -P "and %Ucontext%u is one of the following:" + print -P "" + print -P " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow," + print -P " dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs," + print -P " qunit, reactjs, smacss, stackoverflow, unheap" + print -P "" + print -P "For example: frontend npmjs mocha (or just: npmjs mocha)." + print -P "" + return 1 fi - # check whether the search engine is supported - if [[ ! $1 =~ '(jquery|mdn|compass|html5please|caniuse|aurajs|dartlang|qunit|fontello|bootsnipp|cssflow|codepen|unheap|bem|smacss|angularjs|reactjs|emberjs|stackoverflow)' ]]; + # check whether the search context is supported + if [[ -z "$urls[$1]" ]] then - echo "Search valid search content $1 not supported." - echo "Valid contents: (formats 'frontend <search-content>' or '<search-content>')" - echo "* jquery" - echo "* mdn" - echo "* compass" - echo "* html5please" - echo "* caniuse" - echo "* aurajs" - echo "* dartlang" - echo "* lodash" - echo "* qunit" - echo "* fontello" - echo "* bootsnipp" - echo "* cssflow" - echo "* codepen" - echo "* unheap" - echo "* bem" - echo "* smacss" - echo "* angularjs" - echo "* reactjs" - echo "* emberjs" - echo "* stackoverflow" + echo "Search context \"$1\" currently not supported." + echo "" + echo "Valid contexts are:" + echo "" + echo " angularjs, aurajs, bem, bootsnipp, caniuse, codepen, compass, cssflow, " + echo " dartlang, emberjs, fontello, html5please, jquery, lodash, mdn, npmjs, " + echo " qunit, reactjs, smacss, stackoverflow, unheap" echo "" - return 1 fi - local url="http://" - local query="" - - case "$1" in - "jquery") - url="${url}api.jquery.com" - url="${url}/?s=$2" ;; - "mdn") - url="${url}developer.mozilla.org" - url="${url}/search?q=$2" ;; - "compass") - url="${url}compass-style.org" - url="${url}/search?q=$2" ;; - "html5please") - url="${url}html5please.com" - url="${url}/#$2" ;; - "caniuse") - url="${url}caniuse.com" - url="${url}/#search=$2" ;; - "aurajs") - url="${url}aurajs.com" - url="${url}/api/#stq=$2" ;; - "dartlang") - url="${url}api.dartlang.org/apidocs/channels/stable/dartdoc-viewer" - url="${url}/dart-$2" ;; - "qunit") - url="${url}api.qunitjs.com" - url="${url}/?s=$2" ;; - "fontello") - url="${url}fontello.com" - url="${url}/#search=$2" ;; - "bootsnipp") - url="${url}bootsnipp.com" - url="${url}/search?q=$2" ;; - "cssflow") - url="${url}cssflow.com" - url="${url}/search?q=$2" ;; - "codepen") - url="${url}codepen.io" - url="${url}/search?q=$2" ;; - "unheap") - url="${url}www.unheap.com" - url="${url}/?s=$2" ;; - "bem") - url="${url}google.com" - url="${url}/search?as_q=$2&as_sitesearch=bem.info" ;; - "smacss") - url="${url}google.com" - url="${url}/search?as_q=$2&as_sitesearch=smacss.com" ;; - "angularjs") - url="${url}google.com" - url="${url}/search?as_q=$2&as_sitesearch=angularjs.org" ;; - "reactjs") - url="${url}google.com" - url="${url}/search?as_q=$2&as_sitesearch=facebook.github.io/react" ;; - "emberjs") - url="${url}emberjs.com" - url="${url}/api/#stq=$2&stp=1" ;; - "stackoverflow") - url="${url}stackoverflow.com" - url="${url}/search?q=$2" ;; - *) echo "INVALID PARAM!" - return ;; - esac - - echo "$url" + # build search url: + # join arguments passed with '+', then append to search context URL + # TODO substitute for proper urlencode method + url="${urls[$1]}${(j:+:)@[2,-1]}" - $open_cmd "$url" + echo "Opening $url ..." + open_command "$url" } - -# javascript -alias jquery='frontend jquery' -alias mdn='frontend mdn' - -# pre processors frameworks -alias compassdoc='frontend compass' - -# important links -alias html5please='frontend html5please' -alias caniuse='frontend caniuse' - -# components and libraries -alias aurajs='frontend aurajs' -alias dartlang='frontend dartlang' -alias lodash='frontend lodash' - -#tests -alias qunit='frontend qunit' - -#fonts -alias fontello='frontend fontello' - -# snippets -alias bootsnipp='frontend bootsnipp' -alias cssflow='frontend cssflow' -alias codepen='frontend codepen' -alias unheap='frontend unheap' - -# css architecture -alias bem='frontend bem' -alias smacss='frontend smacss' - -# frameworks -alias angularjs='frontend angularjs' -alias reactjs='frontend reactjs' -alias emberjs='frontend emberjs' - -# search websites -alias stackoverflow='frontend stackoverflow' diff --git a/plugins/git-extras/git-extras.plugin.zsh b/plugins/git-extras/git-extras.plugin.zsh index 8419166ab..d91c1af81 100644 --- a/plugins/git-extras/git-extras.plugin.zsh +++ b/plugins/git-extras/git-extras.plugin.zsh @@ -3,19 +3,20 @@ # Description # ----------- # -# Completion script for git-extras (http://github.com/visionmedia/git-extras). +# Completion script for git-extras (http://github.com/tj/git-extras). # # ------------------------------------------------------------------------------ # Authors # ------- # # * Alexis GRIMALDI (https://github.com/agrimaldi) +# * spacewander (https://github.com/spacewander) # # ------------------------------------------------------------------------------ # Inspirations # ----------- # -# * git-extras (http://github.com/visionmedia/git-extras) +# * git-extras (http://github.com/tj/git-extras) # * git-flow-completion (http://github.com/bobthecow/git-flow-completion) # # ------------------------------------------------------------------------------ @@ -30,10 +31,21 @@ __git_command_successful () { } +__git_commits() { + declare -A commits + git log --oneline -15 | sed 's/\([[:alnum:]]\{7\}\) /\1:/' | while read commit + do + hash=$(echo $commit | cut -d':' -f1) + commits[$hash]="$commit" + done + local ret=1 + _describe -t commits commit commits && ret=0 +} + __git_tag_names() { local expl declare -a tag_names - tag_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/}) + tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/}) __git_command_successful || return _wanted tag-names expl tag-name compadd $* - $tag_names } @@ -47,31 +59,27 @@ __git_branch_names() { _wanted branch-names expl branch-name compadd $* - $branch_names } - -__git_feature_branch_names() { +__git_specific_branch_names() { local expl declare -a branch_names - branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/feature 2>/dev/null)"}#refs/heads/feature/}) + branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/}) __git_command_successful || return _wanted branch-names expl branch-name compadd $* - $branch_names } +__git_feature_branch_names() { + __git_specific_branch_names 'feature' +} + + __git_refactor_branch_names() { - local expl - declare -a branch_names - branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/refactor 2>/dev/null)"}#refs/heads/refactor/}) - __git_command_successful || return - _wanted branch-names expl branch-name compadd $* - $branch_names + __git_specific_branch_names 'refactor' } __git_bug_branch_names() { - local expl - declare -a branch_names - branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/bug 2>/dev/null)"}#refs/heads/bug/}) - __git_command_successful || return - _wanted branch-names expl branch-name compadd $* - $branch_names + __git_specific_branch_names 'bug' } @@ -92,19 +100,43 @@ __git_author_names() { _wanted author-names expl author-name compadd $* - $author_names } +# subcommands -_git-changelog() { - _arguments \ - '(-l --list)'{-l,--list}'[list commits]' \ +_git-bug() { + local curcontext=$curcontext state line ret=1 + declare -A opt_args + + _arguments -C \ + ': :->command' \ + '*:: :->option-or-argument' && ret=0 + + case $state in + (command) + declare -a commands + commands=( + 'finish:merge bug into the current branch' + ) + _describe -t commands command commands && ret=0 + ;; + (option-or-argument) + curcontext=${curcontext%:*}-$line[1]: + case $line[1] in + (finish) + _arguments -C \ + ':branch-name:__git_bug_branch_names' + ;; + esac + esac } -_git-effort() { +_git-changelog() { _arguments \ - '--above[ignore file with less than x commits]' \ + '(-l --list)'{-l,--list}'[list commits]' \ } + _git-contrib() { _arguments \ ':author:__git_author_names' @@ -135,6 +167,11 @@ _git-delete-tag() { } +_git-effort() { + _arguments \ + '--above[ignore file with less than x commits]' +} + _git-extras() { local curcontext=$curcontext state line ret=1 declare -A opt_args @@ -154,20 +191,7 @@ _git-extras() { esac _arguments \ - '(-v --version)'{-v,--version}'[show current version]' \ -} - - -_git-graft() { - _arguments \ - ':src-branch-name:__git_branch_names' \ - ':dest-branch-name:__git_branch_names' -} - - -_git-squash() { - _arguments \ - ':branch-name:__git_branch_names' + '(-v --version)'{-v,--version}'[show current version]' } @@ -199,6 +223,25 @@ _git-feature() { } +_git-graft() { + _arguments \ + ':src-branch-name:__git_branch_names' \ + ':dest-branch-name:__git_branch_names' +} + + +_git-ignore() { + _arguments -C \ + '(--local -l)'{--local,-l}'[show local gitignore]' \ + '(--global -g)'{--global,-g}'[show global gitignore]' +} + +_git-missing() { + _arguments \ + ':first-branch-name:__git_branch_names' \ + ':second-branch-name:__git_branch_names' +} + _git-refactor() { local curcontext=$curcontext state line ret=1 declare -A opt_args @@ -227,59 +270,62 @@ _git-refactor() { } -_git-bug() { - local curcontext=$curcontext state line ret=1 - declare -A opt_args - - _arguments -C \ - ': :->command' \ - '*:: :->option-or-argument' && ret=0 +_git-squash() { + _arguments \ + ':branch-name:__git_branch_names' +} - case $state in - (command) - declare -a commands - commands=( - 'finish:merge bug into the current branch' - ) - _describe -t commands command commands && ret=0 - ;; - (option-or-argument) - curcontext=${curcontext%:*}-$line[1]: - case $line[1] in - (finish) - _arguments -C \ - ':branch-name:__git_bug_branch_names' - ;; - esac - esac +_git-summary() { + _arguments '--line[summarize with lines other than commits]' + __git_commits } +_git-undo(){ + _arguments -C \ + '(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \ + '(--hard -h)'{--hard,-h}'[wipes your commit(s)]' +} + zstyle ':completion:*:*:git:*' user-commands \ + alias:'define, search and show aliases' \ + archive-file:'export the current HEAD of the git repository to a archive' \ + back:'undo and stage latest commits' \ + bug:'create a bug branch' \ changelog:'populate changelog file with commits since the previous tag' \ + commits-since:'list commits since a given date' \ contrib:'display author contributions' \ count:'count commits' \ + create-branch:'create local and remote branch' \ delete-branch:'delete local and remote branch' \ + delete-merged-brancees:'delete merged branches'\ delete-submodule:'delete submodule' \ delete-tag:'delete local and remote tag' \ + effort:'display effort statistics' \ extras:'git-extras' \ - graft:'merge commits from source branch to destination branch' \ - squash:'merge commits from source branch into the current one as a single commit' \ feature:'create a feature branch' \ - refactor:'create a refactor branch' \ - bug:'create a bug branch' \ - summary:'repository summary' \ - effort:'display effort statistics' \ - repl:'read-eval-print-loop' \ - commits-since:'list commits since a given date' \ - release:'release commit with the given tag' \ - alias:'define, search and show aliases' \ + fork:'fork a repo on github' \ + fresh-branch:'create empty local branch' \ + gh-pages:'create the GitHub Pages branch' \ + graft:'merge commits from source branch to destination branch' \ ignore:'add patterns to .gitignore' \ info:'show info about the repository' \ - create-branch:'create local and remote branch' \ - fresh-branch:'create empty local branch' \ - undo:'remove the latest commit' \ + local-commits:'list unpushed commits on the local branch' \ + lock:'lock a file excluded from version control' \ + locked:'ls files that have been locked' \ + missing:'show commits missing from another branch' \ + pr:'checks out a pull request locally' \ + rebase-patch:'rebases a patch' \ + refactor:'create a refactor branch' \ + release:'commit, tag and push changes to the repository' \ + rename-tag:'rename a tag' \ + repl:'read-eval-print-loop' \ + reset-file:'reset one file' \ + root:'show path of root' \ setup:'setup a git repository' \ + show-tree:'show branch tree of commit history' \ + squash:'merge commits from source branch into the current one as a single commit' \ + summary:'repository summary' \ touch:'one step creation of new files' \ - obliterate:'Completely remove a file from the repository, including past commits and tags' \ - local-commits:'list unpushed commits on the local branch' \ + undo:'remove the latest commit' \ + unlock:'unlock a file excluded from version control' diff --git a/plugins/git-flow/git-flow.plugin.zsh b/plugins/git-flow/git-flow.plugin.zsh index 4357c0895..444440bcb 100644 --- a/plugins/git-flow/git-flow.plugin.zsh +++ b/plugins/git-flow/git-flow.plugin.zsh @@ -21,7 +21,7 @@ # #Alias -alias gf='git flow' +alias gfl='git flow' alias gcd='git checkout develop' alias gch='git checkout hotfix' alias gcr='git checkout release' diff --git a/plugins/git-prompt/git-prompt.plugin.zsh b/plugins/git-prompt/git-prompt.plugin.zsh index d868a5fe1..5175bf70f 100644 --- a/plugins/git-prompt/git-prompt.plugin.zsh +++ b/plugins/git-prompt/git-prompt.plugin.zsh @@ -1,57 +1,92 @@ # ZSH Git Prompt Plugin from: # http://github.com/olivierverdier/zsh-git-prompt -# -export __GIT_PROMPT_DIR=$ZSH/plugins/git-prompt -# Allow for functions in the prompt. -setopt PROMPT_SUBST +__GIT_PROMPT_DIR="${0:A:h}" -## Enable auto-execution of functions. -typeset -ga preexec_functions -typeset -ga precmd_functions -typeset -ga chpwd_functions - -# Append git functions needed for prompt. -preexec_functions+='preexec_update_git_vars' -precmd_functions+='precmd_update_git_vars' -chpwd_functions+='chpwd_update_git_vars' +## Hook function definitions +function chpwd_update_git_vars() { + update_current_git_vars +} -## Function definitions function preexec_update_git_vars() { case "$2" in - git*) + git*|hub*|gh*|stg*) __EXECUTED_GIT_COMMAND=1 ;; esac } function precmd_update_git_vars() { - if [ -n "$__EXECUTED_GIT_COMMAND" ]; then + if [ -n "$__EXECUTED_GIT_COMMAND" ] || [ ! -n "$ZSH_THEME_GIT_PROMPT_CACHE" ]; then update_current_git_vars unset __EXECUTED_GIT_COMMAND fi } -function chpwd_update_git_vars() { - update_current_git_vars -} +chpwd_functions+=(chpwd_update_git_vars) +precmd_functions+=(precmd_update_git_vars) +preexec_functions+=(preexec_update_git_vars) + +## Function definitions function update_current_git_vars() { unset __CURRENT_GIT_STATUS local gitstatus="$__GIT_PROMPT_DIR/gitstatus.py" - _GIT_STATUS=`python ${gitstatus}` - __CURRENT_GIT_STATUS=("${(f)_GIT_STATUS}") + _GIT_STATUS=$(python ${gitstatus} 2>/dev/null) + __CURRENT_GIT_STATUS=("${(@s: :)_GIT_STATUS}") + GIT_BRANCH=$__CURRENT_GIT_STATUS[1] + GIT_AHEAD=$__CURRENT_GIT_STATUS[2] + GIT_BEHIND=$__CURRENT_GIT_STATUS[3] + GIT_STAGED=$__CURRENT_GIT_STATUS[4] + GIT_CONFLICTS=$__CURRENT_GIT_STATUS[5] + GIT_CHANGED=$__CURRENT_GIT_STATUS[6] + GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7] } -function prompt_git_info() { +git_super_status() { + precmd_update_git_vars if [ -n "$__CURRENT_GIT_STATUS" ]; then - echo "(%{${fg[red]}%}$__CURRENT_GIT_STATUS[1]%{${fg[default]}%}$__CURRENT_GIT_STATUS[2]%{${fg[magenta]}%}$__CURRENT_GIT_STATUS[3]%{${fg[default]}%})" + STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}" + if [ "$GIT_BEHIND" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}" + fi + if [ "$GIT_AHEAD" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_AHEAD$GIT_AHEAD%{${reset_color}%}" + fi + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_SEPARATOR" + if [ "$GIT_STAGED" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_STAGED$GIT_STAGED%{${reset_color}%}" + fi + if [ "$GIT_CONFLICTS" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CONFLICTS$GIT_CONFLICTS%{${reset_color}%}" + fi + if [ "$GIT_CHANGED" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}" + fi + if [ "$GIT_UNTRACKED" -ne "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED%{${reset_color}%}" + fi + if [ "$GIT_CHANGED" -eq "0" ] && [ "$GIT_CONFLICTS" -eq "0" ] && [ "$GIT_STAGED" -eq "0" ] && [ "$GIT_UNTRACKED" -eq "0" ]; then + STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CLEAN" + fi + STATUS="$STATUS%{${reset_color}%}$ZSH_THEME_GIT_PROMPT_SUFFIX" + echo "$STATUS" fi } +# Default values for the appearance of the prompt. +ZSH_THEME_GIT_PROMPT_PREFIX="(" +ZSH_THEME_GIT_PROMPT_SUFFIX=")" +ZSH_THEME_GIT_PROMPT_SEPARATOR="|" +ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}" +ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}" +ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}" +ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}" +ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}" +ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%{…%G%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}" + # Set the prompt. -#PROMPT='%B%m%~%b$(prompt_git_info) %# ' -# for a right prompt: -#RPROMPT='%b$(prompt_git_info)' -RPROMPT='$(prompt_git_info)' +RPROMPT='$(git_super_status)' diff --git a/plugins/git-prompt/gitstatus.py b/plugins/git-prompt/gitstatus.py index 256841432..a8eb8284b 100644 --- a/plugins/git-prompt/gitstatus.py +++ b/plugins/git-prompt/gitstatus.py @@ -1,82 +1,84 @@ #!/usr/bin/env python -# -*- coding: UTF-8 -*- -from subprocess import Popen, PIPE -import re +from __future__ import print_function -# change those symbols to whatever you prefer -symbols = { - 'ahead of': '↑', - 'behind': '↓', - 'staged': '♦', - 'changed': '‣', - 'untracked': '…', - 'clean': '⚡', - 'unmerged': '≠', - 'sha1': ':' -} +import sys +import re +import shlex +from subprocess import Popen, PIPE, check_output -output, error = Popen( - ['git', 'status'], stdout=PIPE, stderr=PIPE, universal_newlines=True).communicate() -if error: - import sys - sys.exit(0) -lines = output.splitlines() +def get_tagname_or_hash(): + """return tagname if exists else hash""" + cmd = 'git log -1 --format="%h%d"' + output = check_output(shlex.split(cmd)).decode('utf-8').strip() + hash_, tagname = None, None + # get hash + m = re.search('\(.*\)$', output) + if m: + hash_ = output[:m.start()-1] + # get tagname + m = re.search('tag: .*[,\)]', output) + if m: + tagname = 'tags/' + output[m.start()+len('tag: '): m.end()-1] -behead_re = re.compile( - r"^# Your branch is (ahead of|behind) '(.*)' by (\d+) commit") -diverge_re = re.compile(r"^# and have (\d+) and (\d+) different") + if tagname: + return tagname + elif hash_: + return hash_ + return None -status = '' -staged = re.compile(r'^# Changes to be committed:$', re.MULTILINE) -changed = re.compile(r'^# Changed but not updated:$', re.MULTILINE) -untracked = re.compile(r'^# Untracked files:$', re.MULTILINE) -unmerged = re.compile(r'^# Unmerged paths:$', re.MULTILINE) +# `git status --porcelain --branch` can collect all information +# branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind +po = Popen(['git', 'status', '--porcelain', '--branch'], stdout=PIPE, stderr=PIPE) +stdout, sterr = po.communicate() +if po.returncode != 0: + sys.exit(0) # Not a git repository -def execute(*command): - out, err = Popen(stdout=PIPE, stderr=PIPE, *command).communicate() - if not err: - nb = len(out.splitlines()) +# collect git status information +untracked, staged, changed, conflicts = [], [], [], [] +ahead, behind = 0, 0 +status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()] +for st in status: + if st[0] == '#' and st[1] == '#': + if re.search('Initial commit on', st[2]): + branch = st[2].split(' ')[-1] + elif re.search('no branch', st[2]): # detached status + branch = get_tagname_or_hash() + elif len(st[2].strip().split('...')) == 1: + branch = st[2].strip() + else: + # current and remote branch info + branch, rest = st[2].strip().split('...') + if len(rest.split(' ')) == 1: + # remote_branch = rest.split(' ')[0] + pass + else: + # ahead or behind + divergence = ' '.join(rest.split(' ')[1:]) + divergence = divergence.lstrip('[').rstrip(']') + for div in divergence.split(', '): + if 'ahead' in div: + ahead = int(div[len('ahead '):].strip()) + elif 'behind' in div: + behind = int(div[len('behind '):].strip()) + elif st[0] == '?' and st[1] == '?': + untracked.append(st) else: - nb = '?' - return nb - -if staged.search(output): - nb = execute( - ['git', 'diff', '--staged', '--name-only', '--diff-filter=ACDMRT']) - status += '%s%s' % (symbols['staged'], nb) -if unmerged.search(output): - nb = execute(['git', 'diff', '--staged', '--name-only', '--diff-filter=U']) - status += '%s%s' % (symbols['unmerged'], nb) -if changed.search(output): - nb = execute(['git', 'diff', '--name-only', '--diff-filter=ACDMRT']) - status += '%s%s' % (symbols['changed'], nb) -if untracked.search(output): - status += symbols['untracked'] -if status == '': - status = symbols['clean'] - -remote = '' - -bline = lines[0] -if bline.find('Not currently on any branch') != -1: - branch = symbols['sha1'] + Popen([ - 'git', - 'rev-parse', - '--short', - 'HEAD'], stdout=PIPE).communicate()[0][:-1] -else: - branch = bline.split(' ')[-1] - bstatusline = lines[1] - match = behead_re.match(bstatusline) - if match: - remote = symbols[match.groups()[0]] - remote += match.groups()[2] - elif lines[2:]: - div_match = diverge_re.match(lines[2]) - if div_match: - remote = "{behind}{1}{ahead of}{0}".format( - *div_match.groups(), **symbols) + if st[1] == 'M': + changed.append(st) + if st[0] == 'U': + conflicts.append(st) + elif st[0] != ' ': + staged.append(st) -print('\n'.join([branch, remote, status])) +out = ' '.join([ + branch, + str(ahead), + str(behind), + str(len(staged)), + str(len(conflicts)), + str(len(changed)), + str(len(untracked)), +]) +print(out, end='') diff --git a/plugins/git/README.md b/plugins/git/README.md index 8462dda1c..76da2a8ae 100644 --- a/plugins/git/README.md +++ b/plugins/git/README.md @@ -1,4 +1,10 @@ ## git -**Maintainer:** [Stibbons](https://github.com/Stibbons) -This plugin adds several git aliases and increase the completion function provided by zsh +**Maintainer:** [@ncanceill](https://github.com/ncanceill) + +This plugin adds many useful aliases and functions. + +### Usage + +See the [wiki](https://github.com/robbyrussell/oh-my-zsh/wiki/Plugin:git) for a list of aliases and functions provided by the plugin. + diff --git a/plugins/git/_git-branch b/plugins/git/_git-branch deleted file mode 100644 index 6b9c1a483..000000000 --- a/plugins/git/_git-branch +++ /dev/null @@ -1,83 +0,0 @@ -#compdef git-branch - -_git-branch () -{ - declare l c m d - - l='--color --no-color -r -a --all -v --verbose --abbrev --no-abbrev' - c='-l -f --force -t --track --no-track --set-upstream --contains --merged --no-merged' - m='-m -M' - d='-d -D' - - declare -a dependent_creation_args - if (( words[(I)-r] == 0 )); then - dependent_creation_args=( - "($l $m $d): :__git_branch_names" - "::start-point:__git_revisions") - fi - - declare -a dependent_deletion_args - if (( words[(I)-d] || words[(I)-D] )); then - dependent_creation_args= - dependent_deletion_args=( - '-r[delete only remote-tracking branches]') - if (( words[(I)-r] )); then - dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_remote_branch_names' - else - dependent_deletion_args+='*: :__git_ignore_line_inside_arguments __git_branch_names' - fi - fi - - declare -a dependent_modification_args - if (( words[(I)-m] || words[(I)-M] )); then - dependent_creation_args= - dependent_modification_args=( - ':old or new branch name:__git_branch_names' - '::new branch name:__git_branch_names') - fi - - _arguments -w -S -s \ - "($c $m $d --no-color :)--color=-[turn on branch coloring]:: :__git_color_whens" \ - "($c $m $d : --color)--no-color[turn off branch coloring]" \ - "($c $m -a --all)-r[list or delete only remote-tracking branches]" \ - "($c $m $d : -r)"{-a,--all}"[list both remote-tracking branches and local branches]" \ - "($c $m $d : -v --verbose)"{-v,--verbose}'[show SHA1 and commit subject line for each head]' \ - "($c $m $d :)--abbrev=[set minimum SHA1 display-length]: :__git_guard_number length" \ - "($c $m $d :)--no-abbrev[do not abbreviate sha1s]" \ - "($l $m $d)-l[create the branch's reflog]" \ - "($l $m $d -f --force)"{-f,--force}"[force the creation of a new branch]" \ - "($l $m $d -t --track)"{-t,--track}"[set up configuration so that pull merges from the start point]" \ - "($l $m $d)--no-track[override the branch.autosetupmerge configuration variable]" \ - "($l $m $d)--set-upstream[set up configuration so that pull merges]" \ - "($l $m $d)--contains=[only list branches which contain the specified commit]: :__git_committishs" \ - "($l $m $d)--merged=[only list branches which are fully contained by HEAD]: :__git_committishs" \ - "($l $m $d)--no-merged=[do not list branches which are fully contained by HEAD]: :__git_committishs" \ - $dependent_creation_args \ - "($l $c $d -M)-m[rename a branch and the corresponding reflog]" \ - "($l $c $d -m)-M[rename a branch even if the new branch-name already exists]" \ - $dependent_modification_args \ - "($l $c $m -D)-d[delete a fully merged branch]" \ - "($l $c $m -d)-D[delete a branch]" \ - $dependent_deletion_args -} - -(( $+functions[__git_ignore_line] )) || -__git_ignore_line () { - declare -a ignored - ignored=() - ((CURRENT > 1)) && - ignored+=(${line[1,CURRENT-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) - ((CURRENT < $#line)) && - ignored+=(${line[CURRENT+1,-1]//(#m)[\[\]()\\*?#<>~\^]/\\$MATCH}) - $* -F ignored -} - -(( $+functions[__git_ignore_line_inside_arguments] )) || -__git_ignore_line_inside_arguments () { - declare -a compadd_opts - - zparseopts -D -E -a compadd_opts V: J: 1 2 n f X: M: P: S: r: R: q F: - - __git_ignore_line $* $compadd_opts -} - diff --git a/plugins/git/_git-remote b/plugins/git/_git-remote deleted file mode 100644 index 4ba62a357..000000000 --- a/plugins/git/_git-remote +++ /dev/null @@ -1,74 +0,0 @@ -#compdef git-remote - -# NOTE: --track is undocumented. -# TODO: --track, -t, --master, and -m should take remote branches, I guess. -# NOTE: --master is undocumented. -# NOTE: --fetch is undocumented. -_git-remote () { - local curcontext=$curcontext state line - declare -A opt_args - - _arguments -C \ - ':command:->command' \ - '*::options:->options' && ret=0 - - case $state in - (command) - declare -a commands - - commands=( - 'add:add a new remote' - 'show:show information about a given remote' - 'prune:delete all stale tracking branches for a given remote' - 'update:fetch updates for a set of remotes' - 'rm:remove a remote from .git/config and all associated tracking branches' - 'rename:rename a remote from .git/config and update all associated tracking branches' - 'set-head:sets or deletes the default branch' - 'set-branches:changes the list of branches tracked by the named remote.' - 'set-url:changes URL remote points to.' - ) - - _describe -t commands 'sub-command' commands && ret=0 - ;; - (options) - case $line[1] in - (add) - _arguments \ - '*'{--track,-t}'[track given branch instead of default glob refspec]:branch:__git_branch_names' \ - '(--master -m)'{--master,-m}'[set the remote'\''s HEAD to point to given master branch]:branch:__git_branch_names' \ - '(--fetch -f)'{--fetch,-f}'[run git-fetch on the new remote after it has been created]' \ - ':branch name:__git_remotes' \ - ':url:_urls' && ret=0 - ;; - (show) - _arguments \ - '-n[do not contact the remote for a list of branches]' \ - ':remote:__git_remotes' && ret=0 - ;; - (prune) - _arguments \ - '(--dry-run -n)'{-n,--dry-run}'[do not actually prune, only list what would be done]' \ - ':remote:__git_remotes' && ret=0 - ;; - (update) - __git_remote-groups && ret=0 - ;; - (rm) - __git_remotes && ret=0 - ;; - (rename) - __git_remotes && ret=0 - ;; - (set-url) - _arguments \ - '*--push[manipulate push URLs]' \ - '(--add)--add[add URL]' \ - '(--delete)--delete[delete URLs]' \ - ':branch name:__git_remotes' \ - ':url:_urls' && ret=0 - ;; - - esac - ;; - esac -} diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index 9da448814..bbee13ab8 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -1,177 +1,223 @@ +# Query/use custom command for `git`. +zstyle -s ":vcs_info:git:*:-all-" "command" _omz_git_git_cmd +: ${_omz_git_git_cmd:=git} + +# +# Functions +# + +# The current branch name +# Usage example: git pull origin $(current_branch) +# Using '--quiet' with 'symbolic-ref' will not cause a fatal error (128) if +# it's not a symbolic ref, but in a Git repo. +function current_branch() { + local ref + ref=$($_omz_git_git_cmd symbolic-ref --quiet HEAD 2> /dev/null) + local ret=$? + if [[ $ret != 0 ]]; then + [[ $ret == 128 ]] && return # no git repo. + ref=$($_omz_git_git_cmd rev-parse --short HEAD 2> /dev/null) || return + fi + echo ${ref#refs/heads/} +} +# The list of remotes +function current_repository() { + if ! $_omz_git_git_cmd rev-parse --is-inside-work-tree &> /dev/null; then + return + fi + echo $($_omz_git_git_cmd remote -v | cut -d':' -f 2) +} +# Pretty log messages +function _git_log_prettily(){ + if ! [ -z $1 ]; then + git log --pretty=$1 + fi +} +# Warn if the current branch is a WIP +function work_in_progress() { + if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then + echo "WIP!!" + fi +} + +# # Aliases +# (sorted alphabetically) +# + alias g='git' -compdef g=git -alias gst='git status' -compdef _git gst=git-status -alias gd='git diff' -compdef _git gd=git-diff -alias gdc='git diff --cached' -compdef _git gdc=git-diff -alias gdt='git diff-tree --no-commit-id --name-only -r' -compdef _git gdc=git diff-tree --no-commit-id --name-only -r -alias gl='git pull' -compdef _git gl=git-pull -alias gup='git pull --rebase' -compdef _git gup=git-fetch -alias gp='git push' -compdef _git gp=git-push -alias gd='git diff' -gdv() { git diff -w "$@" | view - } -compdef _git gdv=git-diff -alias gdt='git difftool' + +alias ga='git add' +alias gaa='git add --all' +alias gapa='git add --patch' + +alias gb='git branch' +alias gba='git branch -a' +alias gbda='git branch --merged | command grep -vE "^(\*|\s*master\s*$)" | command xargs -n 1 git branch -d' +alias gbl='git blame -b -w' +alias gbnm='git branch --no-merged' +alias gbr='git branch --remote' +alias gbs='git bisect' +alias gbsb='git bisect bad' +alias gbsg='git bisect good' +alias gbsr='git bisect reset' +alias gbss='git bisect start' + alias gc='git commit -v' -compdef _git gc=git-commit alias gc!='git commit -v --amend' -compdef _git gc!=git-commit alias gca='git commit -v -a' -compdef _git gc=git-commit alias gca!='git commit -v -a --amend' -compdef _git gca!=git-commit +alias gcan!='git commit -v -a -s --no-edit --amend' +alias gcam='git commit -a -m' +alias gcb='git checkout -b' +alias gcf='git config --list' +alias gcl='git clone --recursive' +alias gclean='git clean -fd' +alias gpristine='git reset --hard && git clean -dfx' +alias gcm='git checkout master' alias gcmsg='git commit -m' -compdef _git gcmsg=git-commit alias gco='git checkout' -compdef _git gco=git-checkout -alias gcm='git checkout master' -alias gr='git remote' -compdef _git gr=git-remote -alias grv='git remote -v' -compdef _git grv=git-remote -alias grmv='git remote rename' -compdef _git grmv=git-remote -alias grrm='git remote remove' -compdef _git grrm=git-remote -alias grset='git remote set-url' -compdef _git grset=git-remote -alias grup='git remote update' -compdef _git grset=git-remote -alias grbi='git rebase -i' -compdef _git grbi=git-rebase -alias grbc='git rebase --continue' -compdef _git grbc=git-rebase -alias grba='git rebase --abort' -compdef _git grba=git-rebase -alias gb='git branch' -compdef _git gb=git-branch -alias gba='git branch -a' -compdef _git gba=git-branch -alias gbr='git branch --remote' alias gcount='git shortlog -sn' compdef gcount=git -alias gcl='git config --list' alias gcp='git cherry-pick' -compdef _git gcp=git-cherry-pick -alias glg='git log --stat --max-count=10' -compdef _git glg=git-log -alias glgg='git log --graph --max-count=10' -compdef _git glgg=git-log -alias glgga='git log --graph --decorate --all' -compdef _git glgga=git-log -alias glo='git log --oneline --decorate --color' -compdef _git glo=git-log -alias glog='git log --oneline --decorate --color --graph' -compdef _git glog=git-log -alias gss='git status -s' -compdef _git gss=git-status -alias ga='git add' -compdef _git ga=git-add -alias gap='git add --patch' -alias gaa='git add --all' -alias gm='git merge' -compdef _git gm=git-merge -alias grh='git reset HEAD' -alias grhh='git reset HEAD --hard' -alias gclean='git reset --hard && git clean -dfx' -alias gwc='git whatchanged -p --abbrev-commit --pretty=medium' - -# Sign and verify commits with GPG alias gcs='git commit -S' -compdef _git gcs=git-commit -alias gsps='git show --pretty=short --show-signature' -compdef _git gsps=git-show - -# Sign and verify tags with GPG -alias gts='git tag -s' -compdef _git gts=git-tag -alias gvt='git verify-tag' -compdef _git gvt=git verify-tag -#remove the gf alias -#alias gf='git ls-files | grep' +alias gd='git diff' +alias gdca='git diff --cached' +alias gdt='git diff-tree --no-commit-id --name-only -r' +gdv() { git diff -w "$@" | view - } +compdef _git gdv=git-diff +alias gdw='git diff --word-diff' -alias gpoat='git push origin --all && git push origin --tags' -alias gmt='git mergetool --no-prompt' -compdef _git gmt=git-mergetool +alias gf='git fetch' +alias gfa='git fetch --all --prune' +function gfg() { git ls-files | grep $@ } +compdef gfg=grep +alias gfo='git fetch origin' alias gg='git gui citool' alias gga='git gui citool --amend' -alias gk='gitk --all --branches' - -alias gsts='git stash show --text' -alias gsta='git stash' -alias gstp='git stash pop' -alias gstd='git stash drop' - -# Will cd into the top of the current repository -# or submodule. -alias grt='cd $(git rev-parse --show-toplevel || echo ".")' - -# Git and svn mix -alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' -compdef git-svn-dcommit-push=git - -alias gsr='git svn rebase' -alias gsd='git svn dcommit' -# -# Will return the current branch name -# Usage example: git pull origin $(current_branch) -# -function current_branch() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || \ - ref=$(git rev-parse --short HEAD 2> /dev/null) || return - echo ${ref#refs/heads/} +ggf() { +[[ "$#" != 1 ]] && local b="$(current_branch)" +git push --force origin "${b:=$1}" } - -function current_repository() { - ref=$(git symbolic-ref HEAD 2> /dev/null) || \ - ref=$(git rev-parse --short HEAD 2> /dev/null) || return - echo $(git remote -v | cut -d':' -f 2) +compdef _git ggf=git-checkout +ggl() { +if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then +git pull origin "${*}" +else +[[ "$#" == 0 ]] && local b="$(current_branch)" +git pull origin "${b:=$1}" +fi } - -# these aliases take advantage of the previous function +compdef _git ggl=git-checkout alias ggpull='git pull origin $(current_branch)' -compdef ggpull=git -alias ggpur='git pull --rebase origin $(current_branch)' -compdef ggpur=git +compdef _git ggpull=git-checkout +ggp() { +if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then +git push origin "${*}" +else +[[ "$#" == 0 ]] && local b="$(current_branch)" +git push origin "${b:=$1}" +fi +} +compdef _git ggp=git-checkout alias ggpush='git push origin $(current_branch)' -compdef ggpush=git -alias ggpnp='git pull origin $(current_branch) && git push origin $(current_branch)' -compdef ggpnp=git - -# Pretty log messages -function _git_log_prettily(){ - if ! [ -z $1 ]; then - git log --pretty=$1 - fi +compdef _git ggpush=git-checkout +ggpnp() { +if [[ "$#" == 0 ]]; then +ggl && ggp +else +ggl "${*}" && ggp "${*}" +fi +} +compdef _git ggpnp=git-checkout +alias ggsup='git branch --set-upstream-to=origin/$(current_branch)' +ggu() { +[[ "$#" != 1 ]] && local b="$(current_branch)" +git pull --rebase origin "${b:=$1}" } +compdef _git ggu=git-checkout +alias ggpur='ggu' +compdef _git ggpur=git-checkout + +alias gignore='git update-index --assume-unchanged' +alias gignored='git ls-files -v | grep "^[[:lower:]]"' +alias git-svn-dcommit-push='git svn dcommit && git push github master:svntrunk' +compdef git-svn-dcommit-push=git + +alias gk='\gitk --all --branches' +compdef _git gk='gitk' +alias gke='\gitk --all $(git log -g --pretty=format:%h)' +compdef _git gke='gitk' + +alias gl='git pull' +alias glg='git log --stat --color' +alias glgp='git log --stat --color -p' +alias glgg='git log --graph --color' +alias glgga='git log --graph --decorate --all' +alias glgm='git log --graph --max-count=10' +alias glo='git log --oneline --decorate --color' +alias glol="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit" +alias glola="git log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --all" +alias glog='git log --oneline --decorate --color --graph' alias glp="_git_log_prettily" compdef _git glp=git-log -# Work In Progress (wip) -# These features allow to pause a branch development and switch to another one (wip) -# When you want to go back to work, just unwip it -# -# This function return a warning if the current branch is a wip -function work_in_progress() { - if $(git log -n 1 2>/dev/null | grep -q -c "\-\-wip\-\-"); then - echo "WIP!!" - fi -} -# these alias commit and uncomit wip branches -alias gwip='git add -A; git ls-files --deleted -z | xargs -r0 git rm; git commit -m "--wip--"' -alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1' +alias gm='git merge' +alias gmom='git merge origin/master' +alias gmt='git mergetool --no-prompt' +alias gmtvim='git mergetool --no-prompt --tool=vimdiff' +alias gmum='git merge upstream/master' + +alias gp='git push' +alias gpd='git push --dry-run' +alias gpoat='git push origin --all && git push origin --tags' +compdef _git gpoat=git-push +alias gpu='git push upstream' +alias gpv='git push -v' + +alias gr='git remote' +alias gra='git remote add' +alias grb='git rebase' +alias grba='git rebase --abort' +alias grbc='git rebase --continue' +alias grbi='git rebase -i' +alias grbm='git rebase master' +alias grbs='git rebase --skip' +alias grh='git reset HEAD' +alias grhh='git reset HEAD --hard' +alias grmv='git remote rename' +alias grrm='git remote remove' +alias grset='git remote set-url' +alias grt='cd $(git rev-parse --show-toplevel || echo ".")' +alias gru='git reset --' +alias grup='git remote update' +alias grv='git remote -v' + +alias gsb='git status -sb' +alias gsd='git svn dcommit' +alias gsi='git submodule init' +alias gsps='git show --pretty=short --show-signature' +alias gsr='git svn rebase' +alias gss='git status -s' +alias gst='git status' +alias gsta='git stash' +alias gstaa='git stash apply' +alias gstd='git stash drop' +alias gstl='git stash list' +alias gstp='git stash pop' +alias gsts='git stash show --text' +alias gsu='git submodule update' + +alias gts='git tag -s' -# these alias ignore changes to file -alias gignore='git update-index --assume-unchanged' alias gunignore='git update-index --no-assume-unchanged' -# list temporarily ignored files -alias gignored='git ls-files -v | grep "^[[:lower:]]"' +alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1' +alias gup='git pull --rebase' +alias gupv='git pull --rebase -v' + +alias gvt='git verify-tag' + +alias gwch='git whatchanged -p --abbrev-commit --pretty=medium' +alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit -m "--wip--"' diff --git a/plugins/gitfast/_git b/plugins/gitfast/_git index fac5e711e..c75b0be7f 100644 --- a/plugins/gitfast/_git +++ b/plugins/gitfast/_git @@ -30,10 +30,10 @@ if [ -z "$script" ]; then local -a locations local e locations=( + "$(dirname ${funcsourcetrace[1]%:*})/git-completion.bash" '/etc/bash_completion.d/git' # fedora, old debian '/usr/share/bash-completion/completions/git' # arch, ubuntu, new debian '/usr/share/bash-completion/git' # gentoo - $(dirname ${funcsourcetrace[1]%:*})/git-completion.bash ) for e in $locations; do test -f $e && script="$e" && break @@ -76,6 +76,14 @@ __gitcomp_nl () compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } +__gitcomp_nl_append () +{ + emulate -L zsh + + local IFS=$'\n' + compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 +} + __gitcomp_file () { emulate -L zsh diff --git a/plugins/gitfast/git-completion.bash b/plugins/gitfast/git-completion.bash index 5da920ecd..9525343fc 100644 --- a/plugins/gitfast/git-completion.bash +++ b/plugins/gitfast/git-completion.bash @@ -1,5 +1,3 @@ -#!bash -# # bash/zsh completion support for core Git. # # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org> @@ -180,9 +178,9 @@ _get_comp_words_by_ref () } fi -__gitcompadd () +__gitcompappend () { - local i=0 + local i=${#COMPREPLY[@]} for x in $1; do if [[ "$x" == "$3"* ]]; then COMPREPLY[i++]="$2$x$4" @@ -190,6 +188,12 @@ __gitcompadd () done } +__gitcompadd () +{ + COMPREPLY=() + __gitcompappend "$@" +} + # Generates completion reply, appending a space to possible completion words, # if necessary. # It accepts 1 to 4 arguments: @@ -220,6 +224,14 @@ __gitcomp () esac } +# Variation of __gitcomp_nl () that appends to the existing list of +# completion candidates, COMPREPLY. +__gitcomp_nl_append () +{ + local IFS=$'\n' + __gitcompappend "$1" "${2-}" "${3-$cur}" "${4- }" +} + # Generates completion reply from newline-separated possible completion words # by appending a space to all of them. # It accepts 1 to 4 arguments: @@ -231,8 +243,8 @@ __gitcomp () # appended. __gitcomp_nl () { - local IFS=$'\n' - __gitcompadd "$1" "${2-}" "${3-$cur}" "${4- }" + COMPREPLY=() + __gitcomp_nl_append "$@" } # Generates completion reply with compgen from newline-separated possible @@ -673,7 +685,6 @@ __git_list_porcelain_commands () index-pack) : plumbing;; init-db) : deprecated;; local-fetch) : plumbing;; - lost-found) : infrequent;; ls-files) : plumbing;; ls-remote) : plumbing;; ls-tree) : plumbing;; @@ -687,14 +698,12 @@ __git_list_porcelain_commands () pack-refs) : plumbing;; parse-remote) : plumbing;; patch-id) : plumbing;; - peek-remote) : plumbing;; prune) : plumbing;; prune-packed) : plumbing;; quiltimport) : import;; read-tree) : plumbing;; receive-pack) : plumbing;; remote-*) : transport;; - repo-config) : deprecated;; rerere) : plumbing;; rev-list) : plumbing;; rev-parse) : plumbing;; @@ -707,7 +716,6 @@ __git_list_porcelain_commands () ssh-*) : transport;; stripspace) : plumbing;; symbolic-ref) : plumbing;; - tar-tree) : deprecated;; unpack-file) : plumbing;; unpack-objects) : plumbing;; update-index) : plumbing;; @@ -901,7 +909,7 @@ _git_add () esac # XXX should we check for --update and --all options ? - __git_complete_index_file "--others --modified" + __git_complete_index_file "--others --modified --directory --no-empty-directory" } _git_archive () @@ -1063,7 +1071,7 @@ _git_clean () esac # XXX should we check for -x option ? - __git_complete_index_file "--others" + __git_complete_index_file "--others --directory" } _git_clone () @@ -1188,7 +1196,7 @@ _git_diff () __git_complete_revlist_file } -__git_mergetools_common="diffuse ecmerge emerge kdiff3 meld opendiff +__git_mergetools_common="diffuse diffmerge ecmerge emerge kdiff3 meld opendiff tkdiff vimdiff gvimdiff xxdiff araxis p4merge bc3 codecompare " @@ -1491,6 +1499,12 @@ _git_mergetool () _git_merge_base () { + case "$cur" in + --*) + __gitcomp "--octopus --independent --is-ancestor --fork-point" + return + ;; + esac __gitcomp_nl "$(__git_refs)" } @@ -1623,7 +1637,7 @@ _git_rebase () --preserve-merges --stat --no-stat --committer-date-is-author-date --ignore-date --ignore-whitespace --whitespace= - --autosquash + --autosquash --fork-point --no-fork-point " return @@ -1833,6 +1847,7 @@ _git_config () branch.*) local pfx="${cur%.*}." cur_="${cur#*.}" __gitcomp_nl "$(__git_heads)" "$pfx" "$cur_" "." + __gitcomp_nl_append $'autosetupmerge\nautosetuprebase\n' "$pfx" "$cur_" return ;; guitool.*.*) @@ -1875,6 +1890,7 @@ _git_config () remote.*) local pfx="${cur%.*}." cur_="${cur#*.}" __gitcomp_nl "$(__git_remotes)" "$pfx" "$cur_" "." + __gitcomp_nl_append "pushdefault" "$pfx" "$cur_" return ;; url.*.*) @@ -1997,6 +2013,7 @@ _git_config () fetch.unpackLimit format.attach format.cc + format.coverLetter format.headers format.numbered format.pretty @@ -2580,7 +2597,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then --*=*|*.) ;; *) c="$c " ;; esac - array[$#array+1]="$c" + array[${#array[@]}+1]="$c" done compset -P '*[=:]' compadd -Q -S '' -p "${2-}" -a -- array && _ret=0 diff --git a/plugins/gitfast/git-prompt.sh b/plugins/gitfast/git-prompt.sh index a81ef5a48..54489080f 100644 --- a/plugins/gitfast/git-prompt.sh +++ b/plugins/gitfast/git-prompt.sh @@ -60,6 +60,7 @@ # of values: # # verbose show number of commits ahead/behind (+/-) upstream +# name if verbose, then also show the upstream abbrev name # legacy don't use the '--count' option available in recent # versions of git-rev-list # git always compare HEAD to @{upstream} @@ -84,13 +85,17 @@ # the colored output of "git status -sb" and are available only when # using __git_ps1 for PROMPT_COMMAND or precmd. +# check whether printf supports -v +__git_printf_supports_v= +printf -v __git_printf_supports_v -- '%s' yes >/dev/null 2>&1 + # stores the divergence from upstream in $p # used by GIT_PS1_SHOWUPSTREAM __git_ps1_show_upstream () { local key value local svn_remote svn_url_pattern count n - local upstream=git legacy="" verbose="" + local upstream=git legacy="" verbose="" name="" svn_remote=() # get some config options from git-config @@ -106,7 +111,7 @@ __git_ps1_show_upstream () ;; svn-remote.*.url) svn_remote[$((${#svn_remote[@]} + 1))]="$value" - svn_url_pattern+="\\|$value" + svn_url_pattern="$svn_url_pattern\\|$value" upstream=svn+git # default upstream is SVN if available, else git ;; esac @@ -118,6 +123,7 @@ __git_ps1_show_upstream () git|svn) upstream="$option" ;; verbose) verbose=1 ;; legacy) legacy=1 ;; + name) name=1 ;; esac done @@ -200,6 +206,9 @@ __git_ps1_show_upstream () *) # diverged from upstream p=" u+${count#* }-${count% *}" ;; esac + if [[ -n "$count" && -n "$name" ]]; then + p="$p $(git rev-parse --abbrev-ref "$upstream" 2>/dev/null)" + fi fi } @@ -250,6 +259,13 @@ __git_ps1_colorize_gitstring () r="$c_clear$r" } +eread () +{ + f="$1" + shift + test -r "$f" && read "$@" <"$f" +} + # __git_ps1 accepts 0 or 1 arguments (i.e., format string) # when called from PS1 using command substitution # in this mode it prints text to add to bash PS1 prompt (includes branch name) @@ -312,9 +328,9 @@ __git_ps1 () local step="" local total="" if [ -d "$g/rebase-merge" ]; then - read b 2>/dev/null <"$g/rebase-merge/head-name" - read step 2>/dev/null <"$g/rebase-merge/msgnum" - read total 2>/dev/null <"$g/rebase-merge/end" + eread "$g/rebase-merge/head-name" b + eread "$g/rebase-merge/msgnum" step + eread "$g/rebase-merge/end" total if [ -f "$g/rebase-merge/interactive" ]; then r="|REBASE-i" else @@ -322,10 +338,10 @@ __git_ps1 () fi else if [ -d "$g/rebase-apply" ]; then - read step 2>/dev/null <"$g/rebase-apply/next" - read total 2>/dev/null <"$g/rebase-apply/last" + eread "$g/rebase-apply/next" step + eread "$g/rebase-apply/last" total if [ -f "$g/rebase-apply/rebasing" ]; then - read b 2>/dev/null <"$g/rebase-apply/head-name" + eread "$g/rebase-apply/head-name" b r="|REBASE" elif [ -f "$g/rebase-apply/applying" ]; then r="|AM" @@ -349,7 +365,7 @@ __git_ps1 () b="$(git symbolic-ref HEAD 2>/dev/null)" else local head="" - if ! read head 2>/dev/null <"$g/HEAD"; then + if ! eread "$g/HEAD" head; then if [ $pcmode = yes ]; then PS1="$ps1pc_start$ps1pc_end" fi @@ -433,7 +449,7 @@ __git_ps1 () local gitstring="$c${b##refs/heads/}${f:+$z$f}$r$p" if [ $pcmode = yes ]; then - if [[ -n ${ZSH_VERSION-} ]]; then + if [ "${__git_printf_supports_v-}" != yes ]; then gitstring=$(printf -- "$printf_format" "$gitstring") else printf -v gitstring -- "$printf_format" "$gitstring" diff --git a/plugins/gradle/gradle.plugin.zsh b/plugins/gradle/gradle.plugin.zsh index 97bf50b43..97941756d 100644 --- a/plugins/gradle/gradle.plugin.zsh +++ b/plugins/gradle/gradle.plugin.zsh @@ -72,7 +72,7 @@ _gradle_tasks () { if [ in_gradle ]; then _gradle_arguments if _gradle_does_task_list_need_generating; then - gradle tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache + gradle tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache fi compadd -X "==== Gradle Tasks ====" `cat .gradletasknamecache` fi @@ -82,7 +82,7 @@ _gradlew_tasks () { if [ in_gradle ]; then _gradle_arguments if _gradle_does_task_list_need_generating; then - gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache + ./gradlew tasks --all | grep "^[ ]*[a-zA-Z0-9:]*\ -\ " | sed "s/ - .*$//" | sed "s/[\ ]*//" > .gradletasknamecache fi compadd -X "==== Gradlew Tasks ====" `cat .gradletasknamecache` fi diff --git a/plugins/gulp/gulp.plugin.zsh b/plugins/gulp/gulp.plugin.zsh new file mode 100644 index 000000000..6017c7b60 --- /dev/null +++ b/plugins/gulp/gulp.plugin.zsh @@ -0,0 +1,29 @@ +#!/usr/bin/env zsh + +# +# gulp-autocompletion-zsh +# +# Autocompletion for your gulp.js tasks +# +# Copyright(c) 2014 André König <andre.koenig@posteo.de> +# MIT Licensed +# + +# +# André König +# Github: https://github.com/akoenig +# Twitter: https://twitter.com/caiifr +# + +# +# Grabs all available tasks from the `gulpfile.js` +# in the current directory. +# +function $$gulp_completion() { + compls=$(grep -Eo "gulp.task\(('(([a-zA-Z0-9]|-)*)',)" gulpfile.js 2>/dev/null | grep -Eo "'(([a-zA-Z0-9]|-)*)'" | sed s/"'"//g | sort) + + completions=(${=compls}) + compadd -- $completions +} + +compdef $$gulp_completion gulp
\ No newline at end of file diff --git a/plugins/heroku/_heroku b/plugins/heroku/_heroku index bb2f7403f..fd72e530e 100644 --- a/plugins/heroku/_heroku +++ b/plugins/heroku/_heroku @@ -143,5 +143,6 @@ _arguments \ $_command_args \ '(--app)--app[the app name]' \ '(--remote)--remote[the remote name]' \ + '(--help)--help[help about the current command]' \ && return 0 diff --git a/plugins/history-substring-search/README.markdown b/plugins/history-substring-search/README.markdown index 143b813a1..c154afdce 100644 --- a/plugins/history-substring-search/README.markdown +++ b/plugins/history-substring-search/README.markdown @@ -1,6 +1,6 @@ To activate this script, please include it the `plugins` variable within `~/.zshrc` - `plugins=(git history-substring-search.zsh)` + `plugins=(git history-substring-search)` See the "history-substring-search.zsh" file for more information: diff --git a/plugins/history-substring-search/history-substring-search.zsh b/plugins/history-substring-search/history-substring-search.zsh index 22f03dd6d..65f0750db 100644 --- a/plugins/history-substring-search/history-substring-search.zsh +++ b/plugins/history-substring-search/history-substring-search.zsh @@ -175,7 +175,6 @@ fi # implementation details #----------------------------------------------------------------------------- -setopt extendedglob zmodload -F zsh/parameter # @@ -284,6 +283,7 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then fi function _history-substring-search-begin() { + setopt localoptions extendedglob _history_substring_search_move_cursor_eol=false _history_substring_search_query_highlight= @@ -350,6 +350,7 @@ function _history-substring-search-begin() { } function _history-substring-search-end() { + setopt localoptions extendedglob _history_substring_search_result=$BUFFER # move the cursor to the end of the command line diff --git a/plugins/history/README.md b/plugins/history/README.md new file mode 100644 index 000000000..dd9286894 --- /dev/null +++ b/plugins/history/README.md @@ -0,0 +1,15 @@ +## history + +Provides a couple of convenient aliases for using the `history` command to examine your command line history. + +### Requirements + +* None. + +### Usage + +* If `h` is called, your command history is listed. Equivalent to using `history` + +* If `hsi` is called with an argument, a **case insensitive** `grep` search is performed on your command history, looking for commands that match the argument provided + +* If `hsi` is called without an argument you will help on `grep` arguments
\ No newline at end of file diff --git a/plugins/httpie/README.md b/plugins/httpie/README.md new file mode 100644 index 000000000..1d4ec48bd --- /dev/null +++ b/plugins/httpie/README.md @@ -0,0 +1,6 @@ +## HTTPie +**Maintainer:** [lululau](https://github.com/lululau) + +This plugin adds completion for HTTPie, which is a command line HTTP client, a user-friendly cURL replacement. + +[HTTPie Homepage](http://httpie.org) diff --git a/plugins/jira/_jira b/plugins/jira/_jira new file mode 100644 index 000000000..b0ea658e2 --- /dev/null +++ b/plugins/jira/_jira @@ -0,0 +1,21 @@ +#compdef jira +#autoload + +local -a _1st_arguments +_1st_arguments=( + 'new:create a new issue' + 'dashboard:open the dashboard' + 'reported:search for issues reported by a user' + 'assigned:search for issues assigned to a user' +) + +_arguments -C \ + ':command:->command' \ + '*::options:->options' + +case $state in + (command) + _describe -t commands "jira subcommand" _1st_arguments + return + ;; +esac diff --git a/plugins/jira/jira.plugin.zsh b/plugins/jira/jira.plugin.zsh index 4a36b882d..89559767f 100644 --- a/plugins/jira/jira.plugin.zsh +++ b/plugins/jira/jira.plugin.zsh @@ -1,90 +1,118 @@ -# To use: add a .jira-url file in the base of your project -# You can also set JIRA_URL in your .zshrc or put .jira-url in your home directory -# .jira-url in the current directory takes precedence +# CLI support for JIRA interaction # -# If you use Rapid Board, set: -#JIRA_RAPID_BOARD="true" -# in you .zshrc +# Setup: +# Add a .jira-url file in the base of your project +# You can also set $JIRA_URL in your .zshrc or put .jira-url in your home directory +# A .jira-url in the current directory takes precedence. +# The same goes with .jira-prefix and $JIRA_PREFIX. # -# Setup: cd to/my/project -# echo "https://name.jira.com" >> .jira-url -# Usage: jira # opens a new issue -# jira ABC-123 # Opens an existing issue -open_jira_issue () { - local open_cmd - if [[ "$OSTYPE" = darwin* ]]; then - open_cmd='open' - else - open_cmd='xdg-open' - fi +# For example: +# cd to/my/project +# echo "https://name.jira.com" >> .jira-url +# +# Variables: +# $JIRA_RAPID_BOARD - set to "true" if you use Rapid Board +# $JIRA_DEFAULT_ACTION - action to do when `jira` is called witn no args +# defaults to "new" +# $JIRA_NAME - Your JIRA username. Used as default for assigned/reported +# $JIRA_PREFIX - Prefix added to issue ID arguments +# +# +# Usage: +# jira # Performs the default action +# jira new # opens a new issue +# jira reported [username] +# jira assigned [username] +# jira dashboard +# jira ABC-123 # Opens an existing issue +# jira ABC-123 m # Opens an existing issue for adding a comment + +: ${JIRA_DEFAULT_ACTION:=new} - if [ -f .jira-url ]; then +function jira() { + local action=${1:=$JIRA_DEFAULT_ACTION} + + local jira_url jira_prefix + if [[ -f .jira-url ]]; then jira_url=$(cat .jira-url) - elif [ -f ~/.jira-url ]; then + elif [[ -f ~/.jira-url ]]; then jira_url=$(cat ~/.jira-url) - elif [[ "x$JIRA_URL" != "x" ]]; then - jira_url=$JIRA_URL + elif [[ -n "${JIRA_URL}" ]]; then + jira_url=${JIRA_URL} else - echo "JIRA url is not specified anywhere." + _jira_url_help return 1 fi - if [ -f .jira-prefix ]; then + if [[ -f .jira-prefix ]]; then jira_prefix=$(cat .jira-prefix) - elif [ -f ~/.jira-prefix ]; then + elif [[ -f ~/.jira-prefix ]]; then jira_prefix=$(cat ~/.jira-prefix) + elif [[ -n "${JIRA_PREFIX}" ]]; then + jira_prefix=${JIRA_PREFIX} else jira_prefix="" fi - if [ -z "$1" ]; then + + if [[ $action == "new" ]]; then echo "Opening new issue" - $open_cmd "${jira_url}/secure/CreateIssue!default.jspa" - elif [[ "$1" = "assigned" || "$1" = "reported" ]]; then - jira_query $@ + open_command "${jira_url}/secure/CreateIssue!default.jspa" + elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then + _jira_query $@ + elif [[ "$action" == "dashboard" ]]; then + echo "Opening dashboard" + open_command "${jira_url}/secure/Dashboard.jspa" else - echo "Opening issue #$1" - if [[ "x$JIRA_RAPID_BOARD" = "xtrue" ]]; then - $open_cmd "$jira_url/issues/$jira_prefix$1" + # Anything that doesn't match a special action is considered an issue name + local issue_arg=$action + local issue="${jira_prefix}${issue_arg}" + local url_fragment='' + if [[ "$2" == "m" ]]; then + url_fragment="#add-comment" + echo "Add comment to issue #$issue" else - $open_cmd "$jira_url/browse/$jira_prefix$1" + echo "Opening issue #$issue" fi - fi -} - -jira_name () { - if [[ -z "$1" ]]; then - if [[ "x${JIRA_NAME}" != "x" ]]; then - jira_name=${JIRA_NAME} + if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then + open_command "${jira_url}/issues/${issue}${url_fragment}" else - echo "JIRA_NAME not specified" - return 1 + open_command "${jira_url}/browse/${issue}${url_fragment}" fi - else - jira_name=$@ fi } -jira_query () { - verb="$1" - if [[ "${verb}" = "reported" ]]; then - lookup=reporter - preposition=by - elif [[ "${verb}" = "assigned" ]]; then - lookup=assignee - preposition=to - else - echo "not a valid lookup $verb" - return 1 - fi - shift 1 - jira_name $@ - if [[ $? = 1 ]]; then - return 1 - fi - echo "Browsing issues ${verb} ${preposition} ${jira_name}" - $open_cmd "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC" +function _jira_url_help() { + cat << EOF +JIRA url is not specified anywhere. +Valid options, in order of precedence: + .jira-url file + \$HOME/.jira-url file + JIRA_URL environment variable +EOF } -alias jira='open_jira_issue' +function _jira_query() { + local verb="$1" + local jira_name lookup preposition query + if [[ "${verb}" == "reported" ]]; then + lookup=reporter + preposition=by + elif [[ "${verb}" == "assigned" ]]; then + lookup=assignee + preposition=to + else + echo "not a valid lookup: $verb" >&2 + return 1 + fi + jira_name=${2:=$JIRA_NAME} + if [[ -z $jira_name ]]; then + echo "JIRA_NAME not specified" >&2 + return 1 + fi + + echo "Browsing issues ${verb} ${preposition} ${jira_name}" + query="${lookup}+%3D+%22${jira_name}%22+AND+resolution+%3D+unresolved+ORDER+BY+priority+DESC%2C+created+ASC" + open_command "${jira_url}/secure/IssueNavigator.jspa?reset=true&jqlQuery=${query}" +} diff --git a/plugins/jump/jump.plugin.zsh b/plugins/jump/jump.plugin.zsh index d082c11e5..e58e7373d 100644 --- a/plugins/jump/jump.plugin.zsh +++ b/plugins/jump/jump.plugin.zsh @@ -13,7 +13,7 @@ jump() { } mark() { - if (( $# == 0 )); then + if [[ ( $# == 0 ) || ( "$1" == "." ) ]]; then MARK=$(basename "$PWD") else MARK="$1" diff --git a/plugins/kitchen/_kitchen b/plugins/kitchen/_kitchen new file mode 100644 index 000000000..54105b61a --- /dev/null +++ b/plugins/kitchen/_kitchen @@ -0,0 +1,41 @@ +# author: Peter Eisentraut +# source: https://gist.github.com/petere/10307599 +# compdef kitchen + +_kitchen() { + local curcontext="$curcontext" state line + typeset -A opt_args + + _arguments '1: :->cmds'\ + '2: :->args' + + case $state in + cmds) + _arguments "1:Commands:(console converge create destroy diagnose driver help init list login setup test verify version)" + ;; + args) + case $line[1] in + converge|create|destroy|diagnose|list|setup|test|verify) + compadd "$@" all + _kitchen_instances + ;; + login) + _kitchen_instances + ;; + esac + ;; + esac +} + +_kitchen_instances() { + if [[ $_kitchen_instances_cache_dir != $PWD ]]; then + unset _kitchen_instances_cache + fi + if [[ ${+_kitchen_instances_cache} -eq 0 ]]; then + _kitchen_instances_cache=(${(f)"$(bundle exec kitchen list -b 2>/dev/null || kitchen list -b 2>/dev/null)"}) + _kitchen_instances_cache_dir=$PWD + fi + compadd -a _kitchen_instances_cache +} + +_kitchen "$@" diff --git a/plugins/laravel5/laravel5.plugin.zsh b/plugins/laravel5/laravel5.plugin.zsh index 2afa99317..38454f40d 100644 --- a/plugins/laravel5/laravel5.plugin.zsh +++ b/plugins/laravel5/laravel5.plugin.zsh @@ -15,6 +15,6 @@ compdef _laravel5 la5 #Alias alias la5='php artisan' -alias la5dump='php artisan dump-autoload' alias la5cache='php artisan cache:clear' -alias la5routes='php artisan routes' +alias la5routes='php artisan route:list' +alias la5vendor='php artisan vendor:publish' diff --git a/plugins/last-working-dir/last-working-dir.plugin.zsh b/plugins/last-working-dir/last-working-dir.plugin.zsh index 4fa6fcc34..c458464ce 100644 --- a/plugins/last-working-dir/last-working-dir.plugin.zsh +++ b/plugins/last-working-dir/last-working-dir.plugin.zsh @@ -8,14 +8,15 @@ mkdir -p $ZSH_CACHE_DIR cache_file="$ZSH_CACHE_DIR/last-working-dir" # Updates the last directory once directory is changed. -function chpwd() { +chpwd_functions+=(chpwd_last_working_dir) +function chpwd_last_working_dir() { # Use >| in case noclobber is set to avoid "file exists" error pwd >| "$cache_file" } # Changes directory to the last working directory. function lwd() { - [[ ! -r "$cache_file" ]] || cd `cat "$cache_file"` + [[ ! -r "$cache_file" ]] || cd "`cat "$cache_file"`" } # Automatically jump to last working directory unless this isn't the first time diff --git a/plugins/lighthouse/lighthouse.plugin.zsh b/plugins/lighthouse/lighthouse.plugin.zsh index 7661c6add..48cddbccc 100644 --- a/plugins/lighthouse/lighthouse.plugin.zsh +++ b/plugins/lighthouse/lighthouse.plugin.zsh @@ -9,7 +9,7 @@ open_lighthouse_ticket () { else lighthouse_url=$(cat .lighthouse-url); echo "Opening ticket #$1"; - `open $lighthouse_url/tickets/$1`; + open_command "$lighthouse_url/tickets/$1"; fi } diff --git a/plugins/man/man.zsh b/plugins/man/man.zsh new file mode 100644 index 000000000..3490b0b61 --- /dev/null +++ b/plugins/man/man.zsh @@ -0,0 +1,27 @@ +# ------------------------------------------------------------------------------ +# Author +# ------ +# +# * Jerry Ling<jerryling315@gmail.com> +# +# ------------------------------------------------------------------------------ +# Usgae +# ----- +# +# man will be inserted before the command +# +# ------------------------------------------------------------------------------ + +man-command-line() { + [[ -z $BUFFER ]] && zle up-history + [[ $BUFFER != man\ * ]] && LBUFFER="man $LBUFFER" +} +zle -N man-command-line +# Defined shortcut keys: [Esc]man +bindkey "\e"man man-command-line + + +# ------------------------------------------------------------------------------ +# Also, you might want to use man-preview included in 'osx' plugin +# just substitute "man" in the function with "man-preview" after you included OS X in +# the .zshrc
\ No newline at end of file diff --git a/plugins/mercurial/README.md b/plugins/mercurial/README.md new file mode 100644 index 000000000..89e1c1743 --- /dev/null +++ b/plugins/mercurial/README.md @@ -0,0 +1,64 @@ +# Mercurial plugin +### Usage +Update .zshrc: + +1. Add name to the list of plugins, e.g. `plugins = (..., mercurial, ...)` + (that is pretty obvious). +2. Change PROMPT variable of current theme to contain current folder mercurial repo info: + + robbyrussel theme is used by default, so you need to modify PROMPT var + from [this file](https://github.com/robbyrussell/oh-my-zsh/blob/master/themes/robbyrussell.zsh-theme) + by adding `$(hg_prompt_info)` after `$(git_prompt_info)`, so currently it + looks next: + + ```diff + - PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + + PROMPT='${ret_status}%{$fg_bold[green]%}%p %{$fg[cyan]%}%c %{$fg_bold[blue]%}$(git_prompt_info)$(hg_prompt_info)%{$fg_bold[blue]%} % %{$reset_color%}' + ``` + + and put modified var at the end of **.zshrc**. +3. Initialize additional vars used in plugin. So in short put next in **.zshrc**: + + ``` + ZSH_THEME_HG_PROMPT_PREFIX="%{$fg_bold[magenta]%}hg:(%{$fg[red]%}" + ZSH_THEME_HG_PROMPT_SUFFIX="%{$reset_color%}" + ZSH_THEME_HG_PROMPT_DIRTY="%{$fg[magenta]%}) %{$fg[yellow]%}✗%{$reset_color%}" + ZSH_THEME_HG_PROMPT_CLEAN="%{$fg[magenta]%})" + ``` + +### What's inside? +#### Adds handy aliases: +###### general +* `hgc` - `hg commit` +* `hgb` - `hg branch` +* `hgba` - `hg branches` +* `hgbk` - `hg bookmarks` +* `hgco` - `hg checkout` +* `hgd` - `hg diff` +* `hged` - `hg diffmerge` + +###### pull and update +* `hgi` - `hg incoming` +* `hgl` - `hg pull -u` +* `hglr` - `hg pull --rebase` +* `hgo` - `hg outgoing` +* `hgp` - `hg push` +* `hgs` - `hg status` +* `hgsl` - `hg log --limit 20 --template "{node|short} | {date|isodatesec} | {author|user}: {desc|strip|firstline}\n"` + +###### this is the 'git commit --amend' equivalent +* `hgca` - `hg qimport -r tip ; hg qrefresh -e ; hg qfinish tip` + +###### list unresolved files (since hg does not list unmerged files in the status command) +* `hgun` - `hg resolve --list` + +#### Displays repo branch and directory status in prompt +This is the same as git plugin does. + +**Note**: additional changes to **.zshrc** are required in order for this to +work. + +### Mantainers +[ptrv](https://github.com/ptrv) - original creator + +[oshybystyi](https://github.com/oshybystyi) - created this README and know how most of code works diff --git a/plugins/mix-fast/README.md b/plugins/mix-fast/README.md new file mode 100644 index 000000000..9a5eccc3f --- /dev/null +++ b/plugins/mix-fast/README.md @@ -0,0 +1,28 @@ +# mix-fast + +Fast mix autocompletion plugin. + +This script caches the output for later usage and significantly speeds it up. +It generates a .mix_tasks cache file for current project. Currently if you want +to update cache you should remove .mix_tasks file + +Inspired by and based on rake-fast zsh plugin. + +This is entirely based on [this pull request by Ullrich Schäfer](https://github.com/robb/.dotfiles/pull/10/), which is inspired by [this Ruby on Rails trick from 2006](http://weblog.rubyonrails.org/2006/3/9/fast-mix-task-completion-for-zsh/). + + +## Installation + +Just add the plugin to your `.zshrc`: + +```bash +plugins=(foo bar mix-fast) +``` + +You might consider adding `.mix_tasks` to your [global .gitignore](https://help.github.com/articles/ignoring-files#global-gitignore) + +## Usage + +`mix`, then press tab + +Currently maintained by [styx](https://github.com/styx/)
\ No newline at end of file diff --git a/plugins/mix-fast/mix-fast.plugin.zsh b/plugins/mix-fast/mix-fast.plugin.zsh new file mode 100644 index 000000000..3719c3525 --- /dev/null +++ b/plugins/mix-fast/mix-fast.plugin.zsh @@ -0,0 +1,29 @@ +_mix_refresh () { + if [ -f .mix_tasks ]; then + rm .mix_tasks + fi + echo "Generating .mix_tasks..." > /dev/stderr + _mix_generate + cat .mix_tasks +} + +_mix_does_task_list_need_generating () { + [ ! -f .mix_tasks ]; +} + +_mix_generate () { + mix --help | grep -v 'iex -S' | tail -n +2 | cut -d " " -f 2 > .mix_tasks +} + +_mix () { + if [ -f mix.exs ]; then + if _mix_does_task_list_need_generating; then + echo "\nGenerating .mix_tasks..." > /dev/stderr + _mix_generate + fi + compadd `cat .mix_tasks` + fi +} + +compdef _mix mix +alias mix_refresh='_mix_refresh' diff --git a/plugins/mix/_mix b/plugins/mix/_mix index b7c982e0a..319932b3f 100644 --- a/plugins/mix/_mix +++ b/plugins/mix/_mix @@ -1,28 +1,43 @@ -#compdef mix +#compdef mix #autoload # Elixir mix zsh completion local -a _1st_arguments _1st_arguments=( - 'archive:Archive this project into a .ez file' - 'clean:Clean generated application files' + 'app.start:Start all registered apps' + 'archive:List all archives' + 'archive.build:Archive this project into a .ez file' + 'archive.install:Install an archive locally' + 'archive.uninstall:Uninstall archives' + 'clean:Delete generated application files' + 'cmd:Executes the given command' 'compile:Compile source files' + 'compile.protocols:Consolidates all protocols in all paths' 'deps:List dependencies and their status' - "deps.clean:Remove dependencies' files" + "deps.clean:Remove the given dependencies' files" 'deps.compile:Compile dependencies' 'deps.get:Get all out of date dependencies' 'deps.unlock:Unlock the given dependencies' - 'deps.update:Update dependencies' - 'do:Executes the commands separated by comma' - 'escriptize:Generates an escript for the project' + 'deps.update:Update the given dependencies' + 'do:Executes the tasks separated by comma' + 'escript.build:Builds an escript for the project' 'help:Print help information for tasks' + 'hex:Print hex help information' + 'hex.config:Read or update hex config' + 'hex.docs:Publish docs for package' + 'hex.info:Print hex information' + 'hex.key:Hex API key tasks' + 'hex.outdated:Shows outdated hex deps for the current project' + 'hex.owner:Hex package ownership tasks' + 'hex.publish:Publish a new package version' + 'hex.search:Search for package names' + 'hex.user:Hex user tasks' + 'loadconfig:Loads and persists the given configuration' 'local:List local tasks' - 'local.install:Install a task or an archive locally' + 'local.hex:Install hex locally' 'local.rebar:Install rebar locally' - 'local.uninstall:Uninstall local tasks or archives' - 'local.hex:Install Hex locally' - 'new:Creates a new Elixir project' + 'new:Create a new Elixir project' 'run:Run the given file or expression' "test:Run a project's tests" '--help:Describe available tasks' @@ -34,7 +49,7 @@ __task_list () local expl declare -a tasks - tasks=(archive clean compile deps deps.clean deps.compile deps.get deps.unlock deps.update do escriptize help local local.install local.rebar local.uninstall new run test) + tasks=(app.start archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.unlock deps.update do escript.build help hex hex.config hex.docs hex.info hex.key hex.outdated hex.owner hex.publish hex.search hex.user loadconfig local local.hex local.rebar new run test) _wanted tasks expl 'help' compadd $tasks } @@ -57,7 +72,7 @@ case $state in (options) case $line[1] in (help) - _arguments ':feature:__task_list' + _arguments ':feature:__task_list' esac ;; esac diff --git a/plugins/n98-magerun/n98-magerun.plugin.zsh b/plugins/n98-magerun/n98-magerun.plugin.zsh new file mode 100755 index 000000000..bfcf27b98 --- /dev/null +++ b/plugins/n98-magerun/n98-magerun.plugin.zsh @@ -0,0 +1,34 @@ +# ------------------------------------------------------------------------------ +# FILE: n98-magerun.plugin.zsh +# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin +# AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com) +# VERSION: 1.0.0 +# ------------------------------------------------------------------------------ + +# n98-magerun basic command completion +_n98_magerun_get_command_list () { + $_comp_command1 --no-ansi | sed "1,/Available commands/d" | awk '/^ +[a-z\-:]+/ { print $1 }' +} + + +_n98_magerun () { + _arguments '1: :->command' '*:optional arg:_files' + + case $state in + command) + compadd $(_n98_magerun_get_command_list) + ;; + *) + esac +} + +compdef _n98_magerun n98-magerun.phar +compdef _n98_magerun n98-magerun + +# Aliases +alias n98='n98-magerun.phar' +alias mage='n98-magerun.phar' +alias magefl='n98-magerun.phar cache:flush' + +# Install n98-magerun into the current directory +alias mage-get='wget https://raw.github.com/netz98/n98-magerun/master/n98-magerun.phar' diff --git a/plugins/node/node.plugin.zsh b/plugins/node/node.plugin.zsh index 39d8b10d9..2463815ac 100644 --- a/plugins/node/node.plugin.zsh +++ b/plugins/node/node.plugin.zsh @@ -1,13 +1,5 @@ # Open the node api for your current version to the optional section. # TODO: Make the section part easier to use. function node-docs { - # get the open command - local open_cmd - if [[ "$OSTYPE" = darwin* ]]; then - open_cmd='open' - else - open_cmd='xdg-open' - fi - - $open_cmd "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1" + open_command "http://nodejs.org/docs/$(node --version)/api/all.html#all_$1" } diff --git a/plugins/osx/osx.plugin.zsh b/plugins/osx/osx.plugin.zsh index d0f9f009a..390960fdc 100644 --- a/plugins/osx/osx.plugin.zsh +++ b/plugins/osx/osx.plugin.zsh @@ -6,7 +6,7 @@ # ------------------------------------------------------------------------------ function tab() { - local command="cd \\\"$PWD\\\"; clear; " + local command="cd \\\"$PWD\\\"; clear" (( $# > 0 )) && command="${command}; $*" the_app=$( @@ -138,23 +138,6 @@ function man-preview() { man -t "$@" | open -f -a Preview } -function trash() { - local trash_dir="${HOME}/.Trash" - local temp_ifs="$IFS" - IFS=$'\n' - for item in "$@"; do - if [[ -e "$item" ]]; then - item_name="$(basename $item)" - if [[ -e "${trash_dir}/${item_name}" ]]; then - mv -f "$item" "${trash_dir}/${item_name} $(date "+%H-%M-%S")" - else - mv -f "$item" "${trash_dir}/" - fi - fi - done - IFS=$temp_ifs -} - function vncviewer() { open vnc://$@ } diff --git a/plugins/paver/paver.plugin.zsh b/plugins/paver/paver.plugin.zsh new file mode 100644 index 000000000..40bdbd12f --- /dev/null +++ b/plugins/paver/paver.plugin.zsh @@ -0,0 +1,16 @@ +_paver_does_target_list_need_generating () { + [ ! -f .paver_targets ] && return 0; + [ pavement.py -nt .paver_targets ] && return 0; + return 1; +} + +_paver () { + if [ -f pavement.py ]; then + if _paver_does_target_list_need_generating; then + paver --help 2>&1 |grep '-'|grep -v -e '--'|awk -F '-' '{print $1}'|tr -d ' ' > .paver_targets + fi + compadd `cat .paver_targets` + fi +} + +compdef _paver paver diff --git a/plugins/pod/_pod b/plugins/pod/_pod index 8c0f4460f..508a47102 100644 --- a/plugins/pod/_pod +++ b/plugins/pod/_pod @@ -1,389 +1,682 @@ #compdef pod #autoload +# setopt XTRACE VERBOSE +# vim: ft=zsh sw=2 ts=2 et + # ----------------------------------------------------------------------------- # FILE: _pod -# DESCRIPTION: Cocoapods (0.27.1) autocomplete plugin for Oh-My-Zsh +# DESCRIPTION: Cocoapods (0.33.1) autocomplete plugin for Oh-My-Zsh # http://cocoapods.org +# Generated with `pod --completion-script # AUTHOR: Alexandre Joly (alexandre.joly@mekanics.ch) # GITHUB: https://github.com/mekanics # TWITTER: @jolyAlexandre -# VERSION: 0.0.3 -# LICENSE: MIT +# VERSION: 0.0.5 # ----------------------------------------------------------------------------- -local -a _1st_arguments -_1st_arguments=( - 'help:Show help for the given command' - 'init:Generate a Podfile for the current directory' - 'install:Install project dependencies' - 'ipc:Inter-process communication' - 'list:List pods' - 'outdated:Show outdated project dependencies' - 'podfile-info:Shows information on installed Pods' - 'push:Push new specifications to a spec-repo' - 'repo:Manage spec-repositories' - 'search:Searches for pods' - 'setup:Setup the CocoaPods environment' - 'spec:Manage pod specs' - 'update:Update outdated project dependencies' -) - -local -a _repo_arguments -_repo_arguments=( - 'add:Add a spec repo' - 'lint:Validates all specs in a repo' - 'remove:Remove a spec repo.' - 'update:Update a spec repo' -) - -local -a _spec_arguments -_spec_arguments=( - 'cat:Prints a spec file' - 'create:Create spec file stub' - 'edit:Edit a spec file' - 'lint:Validates a spec file' - 'which:Prints the path of the given spec' -) - -local -a _ipc_arguments -_ipc_arguments=( - 'list:Lists the specifications know to CocoaPods' - 'podfile:Converts a Podfile to YAML' - 'repl:The repl listens to commands on standard input' - 'spec:Converts a podspec to YAML' - 'update-search-index:Updates the search index' -) - -local -a _list_arguments -_list_arguments=( - 'new:Lists pods introduced in the master spec-repo since the last check' -) - -local -a _inherited_options -_inherited_options=( - '(--silent)--silent[Show nothing]' \ - '(--version)--version[Show the version of CocoaPods]' \ - '(--no-color)--no-color[Show output without color]' \ - '(--verbose)--verbose[Show more debugging information]' \ - '(--help)--help[Show help banner of specified command]' -) - -local -a _install_options -_install_options=( - '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn` intact after downloading]' \ - '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \ - '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]' -) - -local -a _update_options -_update_options=( - '(--no-clean)--no-clean[Leave SCM dirs like `.git` and `.svn intact after downloading]' \ - '(--no-integrate)--no-integrate[Skip integration of the Pods libraries in the Xcode project(s)]' \ - '(--no-repo-update)--no-repo-update[Skip running `pod repo update before install]' -) - -local -a _outdated_options -_outdated_options=( - '(--no-repo-update)--no-repo-update[Skip running `pod repo update` before install]' -) - -local -a _search_options -_search_options=( - '(--full)--full[Search by name, summary, and description]' \ - '(--stats)--stats[Show additional stats (like GitHub watchers and forks)]' \ - '(--ios)--ios[Restricts the search to Pods supported on iOS]' \ - '(--osx)--osx[Restricts the search to Pods supported on OS X]' -) - -local -a _list_options -_list_options=( - '(--update)--update[Run `pod repo update` before listing]' -) - -local -a _podfile_info_options -_podfile_info_options=( - '(--all)--all[Show information about all Pods with dependencies that are used in a project]' \ - '(--md)--md[Output information in Markdown format]' \ - '*:script or directory:_files' -) - -local -a _push_options -_push_options=( - '(--allow-warnings)--allow-warnings[Allows pushing even if there are warnings]' \ - '(--local-only)--local-only[Does not perform the step of pushing REPO to its remote]' \ - '*:script or directory:_files' -) - -local -a _repo_lint_options -_repo_lint_options=( - '(--only-errors)--only-errors[Lint presents only the errors]' -) - -local -a _setup_options -_setup_options=( - '(--push)--push[Use this option to enable push access once granted]' -) - -local -a _spec_lint_options -_spec_lint_options=( - '(--quick)--quick[Lint skips checks that would require to download and build the spec]' \ - '(--only-errors)--only-errors[Lint validates even if warnings are present]' \ - '(--no-clean)--no-clean[Lint leaves the build directory intact for inspection]' \ - '*:script or directory:_files' -) - -local -a _spec_cat_options -_spec_cat_options=( - '(--show-all)--show-all[Pick from all versions of the given podspec]' -) - -local -a _spec_which_options -_spec_which_options=( - '(--show-all)--show-all[Print all versions of the given podspec]' -) - -local -a _spec_edit_options -_spec_edit_options=( - '(--show-all)--show-all[Pick which spec to edit from all available versions of the given podspec]' -) - - -__first_command_list () -{ - local expl - declare -a tasks - - tasks=(install ipc list outdated podfile-info push repo search setup spec update) - - _wanted tasks expl 'help' compadd $tasks -} - -__repo_list() { - _wanted application expl 'repo' compadd $(command ls -1 ~/.cocoapods/repos 2>/dev/null | sed -e 's/ /\\ /g') -} - -__pod-repo() { - local curcontext="$curcontext" state line - typeset -A opt_args - - _arguments -C \ - ':command:->command' \ - '*::options:->options' - - case $state in - (command) - _describe -t commands "pod repo" _repo_arguments - return - ;; - - (options) - case $line[1] in - (lint) - _arguments \ - $_inherited_options \ - $_repo_lint_options \ - ':feature:__repo_list' - ;; - - (update) - _arguments \ - $_inherited_options \ - ':feature:__repo_list' - ;; - - (add) - _arguments \ - $_inherited_options - - (remove) - _arguments \ - $_inherited_options \ - ':feature:__repo_list' - ;; - esac - ;; +local -a _subcommands +local -a _options + +case "$words[2]" in + help) + case "$words[3]" in + *) # pod help + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod help options" _options + ;; esac -} - -__pod-spec() { - local curcontext="$curcontext" state line - typeset -A opt_args - - _arguments -C \ - ':command:->command' \ - '*::options:->options' - - case $state in - (command) - _describe -t commands "pod spec" _spec_arguments - return - ;; - - (options) - case $line[1] in - (create) - _arguments \ - $_inherited_options - ;; - - (lint) - _arguments \ - $_inherited_options \ - $_spec_lint_options - ;; - - (cat) - _arguments \ - $_inherited_options \ - $_spec_cat_options - ;; - - (which) - _arguments \ - $_inherited_options \ - $_spec_which_options - ;; - - (edit) - _arguments \ - $_inherited_options \ - $_spec_edit_options - ;; - esac - return - ;; + ;; + ipc) + case "$words[3]" in + list) + case "$words[4]" in + *) # pod ipc list + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc list options" _options + ;; + esac + ;; + podfile) + case "$words[4]" in + *) # pod ipc podfile + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc podfile options" _options + ;; + esac + ;; + repl) + case "$words[4]" in + *) # pod ipc repl + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc repl options" _options + ;; + esac + ;; + spec) + case "$words[4]" in + *) # pod ipc spec + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc spec options" _options + ;; + esac + ;; + update-search-index) + case "$words[4]" in + *) # pod ipc update-search-index + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc update-search-index options" _options + ;; + esac + ;; + *) # pod ipc + _subcommands=( + "list:Lists the specifications known to CocoaPods." + "podfile:Converts a Podfile to YAML." + "repl:The repl listens to commands on standard input." + "spec:Converts a podspec to JSON." + "update-search-index:Updates the search index." + ) + _describe -t commands "pod ipc subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod ipc options" _options + ;; esac -} - -__pod-ipc() { - local curcontext="$curcontext" state line - typeset -A opt_args - - _arguments -C \ - ':command:->command' \ - '*::options:->options' - - case $state in - (command) - _describe -t commands "pod ipc" _ipc_arguments - return - ;; - - (options) - _arguments -C \ - $_inherited_options - return - ;; + ;; + init) + case "$words[3]" in + *) # pod init + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod init options" _options + ;; esac -} - -__pod-list() { - local curcontext="$curcontext" state line - typeset -A opt_args - - _arguments -C \ - $_inherited_options \ - $_list_options \ - ':command:->command' \ - '*::options:->options' - - case $state in - (command) - _describe -t commands "pod list" _list_arguments - return - ;; - - (options) - _arguments -C \ - $_inherited_options \ - $_list_options - return - ;; + ;; + install) + case "$words[3]" in + *) # pod install + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-clean:Leave SCM dirs like \`.git\` and \`.svn\` intact after downloading" + "--no-integrate:Skip integration of the Pods libraries in the Xcode project(s)" + "--no-repo-update:Skip running \`pod repo update\` before install" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod install options" _options + ;; esac -} - -local curcontext="$curcontext" state line -typeset -A opt_args - -_arguments -C \ - $_inherited_options \ - ':command:->command' \ - '*::options:->options' - -case $state in - (command) - _describe -t commands "pod" _1st_arguments - return ;; - - (options) - case $line[1] in - (help) - _arguments \ - $_inherited_options \ - ':help:__first_command_list' - ;; - - (push) - _arguments \ - $_inherited_options \ - $_push_options \ - ':repo:__repo_list' - ;; - - (repo) - __pod-repo - ;; - - (spec) - __pod-spec - ;; - - (ipc) - __pod-ipc - ;; - - (list) - __pod-list - ;; - - (install) - _arguments \ - $_inherited_options \ - $_install_options - ;; - - (update) - _arguments \ - $_inherited_options \ - $_update_options - ;; - - (outdated) - _arguments \ - $_inherited_options \ - $_outdated_options - ;; - - (search) - _arguments \ - $_inherited_options \ - $_search_options - ;; - - (podfile-info) - _arguments \ - $_inherited_options \ - $_podfile_info_options - ;; - - (setup) - _arguments \ - $_inherited_options \ - $_setup_options - ;; - + lib) + case "$words[3]" in + create) + case "$words[4]" in + *) # pod lib create + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod lib create options" _options + ;; + esac + ;; + lint) + case "$words[4]" in + *) # pod lib lint + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-clean:Lint leaves the build directory intact for inspection" + "--no-subspecs:Lint skips validation of subspecs" + "--only-errors:Lint validates even if warnings are present" + "--quick:Lint skips checks that would require to download and build the spec" + "--silent:Show nothing" + "--subspec=NAME:Lint validates only the given subspec" + "--verbose:Show more debugging information" + ) + _describe -t options "pod lib lint options" _options + ;; + esac + ;; + *) # pod lib + _subcommands=( + "create:Creates a new Pod" + "lint:Validates a Pod" + ) + _describe -t commands "pod lib subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod lib options" _options + ;; + esac + ;; + list) + case "$words[3]" in + new) + case "$words[4]" in + *) # pod list new + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--update:Run \`pod repo update\` before listing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod list new options" _options + ;; + esac + ;; + *) # pod list + _subcommands=( + "new:Lists pods introduced in the master spec-repo since the last check" + ) + _describe -t commands "pod list subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--update:Run \`pod repo update\` before listing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod list options" _options + ;; + esac + ;; + outdated) + case "$words[3]" in + *) # pod outdated + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-repo-update:Skip running \`pod repo update\` before install" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod outdated options" _options + ;; + esac + ;; + plugins) + case "$words[3]" in + create) + case "$words[4]" in + *) # pod plugins create + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod plugins create options" _options + ;; + esac + ;; + list) + case "$words[4]" in + *) # pod plugins list + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--verbose:Show more debugging information" + ) + _describe -t options "pod plugins list options" _options + ;; + esac + ;; + search) + case "$words[4]" in + *) # pod plugins search + _options=( + "--full:Search by name, author, and description" + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--verbose:Show more debugging information" + ) + _describe -t options "pod plugins search options" _options + ;; + esac + ;; + *) # pod plugins + _subcommands=( + "create:Creates a new plugin" + "list:List all known plugins" + "search:Search for known plugins" + ) + _describe -t commands "pod plugins subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod plugins options" _options + ;; + esac + ;; + push) + case "$words[3]" in + *) # pod push + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod push options" _options + ;; + esac + ;; + repo) + case "$words[3]" in + add) + case "$words[4]" in + *) # pod repo add + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--shallow:Create a shallow clone (fast clone, but no push capabilities)" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo add options" _options + ;; + esac + ;; + lint) + case "$words[4]" in + *) # pod repo lint + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--only-errors:Lint presents only the errors" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo lint options" _options + ;; + esac + ;; + push) + case "$words[4]" in + *) # pod repo push + _options=( + "--allow-warnings:Allows pushing even if there are warnings" + "--help:Show help banner of specified command" + "--local-only:Does not perform the step of pushing REPO to its remote" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo push options" _options + ;; + esac + ;; + remove) + case "$words[4]" in + *) # pod repo remove + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo remove options" _options + ;; + esac + ;; + update) + case "$words[4]" in + *) # pod repo update + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo update options" _options + ;; + esac + ;; + *) # pod repo + _subcommands=( + "add:Add a spec repo." + "lint:Validates all specs in a repo." + "push:Push new specifications to a spec-repo" + "remove:Remove a spec repo" + "update:Update a spec repo." + ) + _describe -t commands "pod repo subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod repo options" _options + ;; esac ;; + search) + case "$words[3]" in + *) # pod search + _options=( + "--full:Search by name, summary, and description" + "--help:Show help banner of specified command" + "--ios:Restricts the search to Pods supported on iOS" + "--no-ansi:Show output without ANSI codes" + "--osx:Restricts the search to Pods supported on OS X" + "--stats:Show additional stats (like GitHub watchers and forks)" + "--verbose:Show more debugging information" + "--web:Searches on cocoapods.org" + ) + _describe -t options "pod search options" _options + ;; + esac + ;; + setup) + case "$words[3]" in + *) # pod setup + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-shallow:Clone full history so push will work" + "--push:Use this option to enable push access once granted" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod setup options" _options + ;; + esac + ;; + spec) + case "$words[3]" in + cat) + case "$words[4]" in + *) # pod spec cat + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--show-all:Pick from all versions of the given podspec" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec cat options" _options + ;; + esac + ;; + create) + case "$words[4]" in + *) # pod spec create + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec create options" _options + ;; + esac + ;; + edit) + case "$words[4]" in + *) # pod spec edit + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--show-all:Pick which spec to edit from all available versions of the given podspec" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec edit options" _options + ;; + esac + ;; + lint) + case "$words[4]" in + *) # pod spec lint + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-clean:Lint leaves the build directory intact for inspection" + "--no-subspecs:Lint skips validation of subspecs" + "--only-errors:Lint validates even if warnings are present" + "--quick:Lint skips checks that would require to download and build the spec" + "--silent:Show nothing" + "--subspec=NAME:Lint validates only the given subspec" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec lint options" _options + ;; + esac + ;; + which) + case "$words[4]" in + *) # pod spec which + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--show-all:Print all versions of the given podspec" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec which options" _options + ;; + esac + ;; + *) # pod spec + _subcommands=( + "cat:Prints a spec file." + "create:Create spec file stub." + "edit:Edit a spec file." + "lint:Validates a spec file." + "which:Prints the path of the given spec." + ) + _describe -t commands "pod spec subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod spec options" _options + ;; + esac + ;; + trunk) + case "$words[3]" in + add-owner) + case "$words[4]" in + *) # pod trunk add-owner + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk add-owner options" _options + ;; + esac + ;; + me) + case "$words[4]" in + clean-sessions) + case "$words[5]" in + *) # pod trunk me clean-sessions + _options=( + "--all:Removes all your sessions, except for the current one" + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk me clean-sessions options" _options + ;; + esac + ;; + *) # pod trunk me + _subcommands=( + "clean-sessions:Remove sessions" + ) + _describe -t commands "pod trunk me subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk me options" _options + ;; + esac + ;; + push) + case "$words[4]" in + *) # pod trunk push + _options=( + "--allow-warnings:Allows push even if there are lint warnings" + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk push options" _options + ;; + esac + ;; + register) + case "$words[4]" in + *) # pod trunk register + _options=( + "--description=DESCRIPTION:An arbitrary description to easily identify your session later on." + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk register options" _options + ;; + esac + ;; + *) # pod trunk + _subcommands=( + "add-owner:Add an owner to a pod" + "me:Display information about your sessions" + "push:Publish a podspec" + "register:Manage sessions" + ) + _describe -t commands "pod trunk subcommands" _subcommands + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod trunk options" _options + ;; + esac + ;; + try) + case "$words[3]" in + *) # pod try + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod try options" _options + ;; + esac + ;; + update) + case "$words[3]" in + *) # pod update + _options=( + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--no-clean:Leave SCM dirs like \`.git\` and \`.svn\` intact after downloading" + "--no-integrate:Skip integration of the Pods libraries in the Xcode project(s)" + "--no-repo-update:Skip running \`pod repo update\` before install" + "--silent:Show nothing" + "--verbose:Show more debugging information" + ) + _describe -t options "pod update options" _options + ;; + esac + ;; + *) # pod + _subcommands=( + "help:Show help for the given command." + "ipc:Inter-process communication" + "init:Generate a Podfile for the current directory." + "install:Install project dependencies" + "lib:Develop pods" + "list:List pods" + "outdated:Show outdated project dependencies" + "plugins:Show available CocoaPods plugins" + "push:Temporary alias for the \`pod repo push\` command" + "repo:Manage spec-repositories" + "search:Searches for pods" + "setup:Setup the CocoaPods environment" + "spec:Manage pod specs" + "trunk:Interact with the CocoaPods API (e.g. publishing new specs)" + "try:Try a Pod!" + "update:Update outdated project dependencies" + ) + _describe -t commands "pod subcommands" _subcommands + _options=( + "--completion-script:Print the auto-completion script" + "--help:Show help banner of specified command" + "--no-ansi:Show output without ANSI codes" + "--silent:Show nothing" + "--verbose:Show more debugging information" + "--version:Show the version of the tool" + ) + _describe -t options "pod options" _options + ;; esac diff --git a/plugins/rails/rails.plugin.zsh b/plugins/rails/rails.plugin.zsh index 5ed96f8cd..6824836fc 100644 --- a/plugins/rails/rails.plugin.zsh +++ b/plugins/rails/rails.plugin.zsh @@ -50,6 +50,7 @@ alias rdr='rake db:rollback' alias rdc='rake db:create' alias rds='rake db:seed' alias rdd='rake db:drop' +alias rdrs='rake db:reset' alias rdtc='rake db:test:clone' alias rdtp='rake db:test:prepare' alias rdmtc='rake db:migrate db:test:clone' @@ -59,7 +60,7 @@ alias rn='rake notes' alias rr='rake routes' # legacy stuff -alias ss='thin --stats "/thin/stats" start' +alias sstat='thin --stats "/thin/stats" start' alias sg='ruby script/generate' alias sd='ruby script/destroy' alias sp='ruby script/plugin' diff --git a/plugins/rails3/rails3.plugin.zsh b/plugins/rails3/rails3.plugin.zsh deleted file mode 100644 index 261b92108..000000000 --- a/plugins/rails3/rails3.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -echo "It looks like you have been using the 'rails3' plugin," -echo "which has been deprecated in favor of a newly consolidated 'rails' plugin." -echo "You will want to modify your ~/.zshrc configuration to begin using it." -echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240" diff --git a/plugins/rails4/rails4.plugin.zsh b/plugins/rails4/rails4.plugin.zsh deleted file mode 100644 index 5452c242c..000000000 --- a/plugins/rails4/rails4.plugin.zsh +++ /dev/null @@ -1,4 +0,0 @@ -echo "It looks like you have been using the 'rails4' plugin," -echo "which has been deprecated in favor of a newly consolidated 'rails' plugin." -echo "You will want to modify your ~/.zshrc configuration to begin using it." -echo "Learn more at https://github.com/robbyrussell/oh-my-zsh/pull/2240" diff --git a/plugins/rand-quote/rand-quote.plugin.zsh b/plugins/rand-quote/rand-quote.plugin.zsh index c3bf6234e..8f345d9aa 100644 --- a/plugins/rand-quote/rand-quote.plugin.zsh +++ b/plugins/rand-quote/rand-quote.plugin.zsh @@ -18,8 +18,6 @@ if [[ -x `which curl` ]]; then W=$(echo "$Q" | sed -e 's/.*\/quotes\///g' -e 's/<.*//g' -e 's/.*">//g') if [ "$W" -a "$TXT" ]; then echo "${WHO_COLOR}${W}${COLON_COLOR}: ${TEXT_COLOR}“${TXT}”${END_COLOR}" - else - quote fi } #quote diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index 213e1beb0..ef5106f2d 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -2,14 +2,11 @@ _homebrew-installed() { type brew &> /dev/null } -_rbenv-from-homebrew-installed() { - brew --prefix rbenv &> /dev/null -} - FOUND_RBENV=0 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv") -if _homebrew-installed && _rbenv-from-homebrew-installed ; then - rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") +if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then + rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}") + unset rbenv_homebrew_path fi for rbenvdir in "${rbenvdirs[@]}" ; do diff --git a/plugins/rvm/rvm.plugin.zsh b/plugins/rvm/rvm.plugin.zsh index 234ac1642..53e809aaf 100644 --- a/plugins/rvm/rvm.plugin.zsh +++ b/plugins/rvm/rvm.plugin.zsh @@ -61,11 +61,11 @@ function gems { local current_ruby=`rvm-prompt i v p` local current_gemset=`rvm-prompt g` - gem list $@ | sed \ - -Ee "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \ - -Ee "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \ - -Ee "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \ - -Ee "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g" + gem list $@ | sed -E \ + -e "s/\([0-9, \.]+( .+)?\)/$fg[blue]&$reset_color/g" \ + -e "s|$(echo $rvm_path)|$fg[magenta]\$rvm_path$reset_color|g" \ + -e "s/$current_ruby@global/$fg[yellow]&$reset_color/g" \ + -e "s/$current_ruby$current_gemset$/$fg[green]&$reset_color/g" } function _rvm_completion { diff --git a/plugins/spring/README.md b/plugins/spring/README.md new file mode 100644 index 000000000..62bfd8013 --- /dev/null +++ b/plugins/spring/README.md @@ -0,0 +1,25 @@ +# Spring Boot oh-my-zsh plugin +oh-my-zsh Spring Boot plugin + +## Spring Boot autocomplete plugin + +- Adds autocomplete options for all spring boot commands. + +## Manual Install + + $ cd ~/.oh-my-zsh/plugins + $ git clone git@github.com:linux-china/oh-my-zsh-spring-boot-plugin.git spring + +Adjust your .zshrc file and add spring to plugins=(...) + +## Tips + +* Install Spring Cloud plugin: spring install org.springframework.cloud:spring-cloud-cli:1.0.2.RELEASE + +## Reference + +* Spring Boot: http://projects.spring.io/spring-boot/ +* Spring Boot CLI: http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#cli + +Maintainer : linux_china ([@linux_china](https://twitter.com/linux_china)) + diff --git a/plugins/spring/_spring b/plugins/spring/_spring new file mode 100644 index 000000000..93f19517d --- /dev/null +++ b/plugins/spring/_spring @@ -0,0 +1,29 @@ +#compdef spring 'spring' +#autoload + +_spring() { + + local cword + let cword=CURRENT-1 + + local hints + hints=() + + local reply + while read -r line; do + reply=`echo "$line" | awk '{printf $1 ":"; for (i=2; i<NF; i++) printf $i " "; print $NF}'` + hints+=("$reply") + done < <(spring hint ${cword} ${words[*]}) + + if ((cword == 1)) { + _describe -t commands 'commands' hints + return 0 + } + + _describe -t options 'options' hints + _files + + return 0 +} + +_spring "$@"
\ No newline at end of file diff --git a/plugins/sublime/README.md b/plugins/sublime/README.md index e38cf66dc..e1e666f05 100644 --- a/plugins/sublime/README.md +++ b/plugins/sublime/README.md @@ -14,4 +14,6 @@ Plugin for Sublime Text, a cross platform text and code editor, available for Li * If `st` is passed a file, open it in Sublime Text - * if `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text
\ No newline at end of file + * If `stt` command is called, it is equivalent to `st .`, opening the current folder in Sublime Text + + * If `sst` command is called, it is like `sudo st`, opening the file or folder in Sublime Text. Useful for editing system protected files.
\ No newline at end of file diff --git a/plugins/sublime/sublime.plugin.zsh b/plugins/sublime/sublime.plugin.zsh index 38a7596fd..4b93c1580 100644 --- a/plugins/sublime/sublime.plugin.zsh +++ b/plugins/sublime/sublime.plugin.zsh @@ -5,9 +5,12 @@ if [[ $('uname') == 'Linux' ]]; then _sublime_linux_paths=( "$HOME/bin/sublime_text" "/opt/sublime_text/sublime_text" + "/opt/sublime_text_3/sublime_text" "/usr/bin/sublime_text" "/usr/local/bin/sublime_text" "/usr/bin/subl" + "/opt/sublime_text_3/sublime_text" + "/usr/bin/subl3" ) for _sublime_path in $_sublime_linux_paths; do if [[ -a $_sublime_path ]]; then @@ -33,7 +36,7 @@ elif [[ "$OSTYPE" = darwin* ]]; then for _sublime_path in $_sublime_darwin_paths; do if [[ -a $_sublime_path ]]; then - alias subl="'$_sublime_path'" + subl () { "$_sublime_path" $* } alias st=subl break fi diff --git a/plugins/svn/svn.plugin.zsh b/plugins/svn/svn.plugin.zsh index 9f7a4c6eb..816055afe 100644 --- a/plugins/svn/svn.plugin.zsh +++ b/plugins/svn/svn.plugin.zsh @@ -1,16 +1,17 @@ # vim:ft=zsh ts=2 sw=2 sts=2 # function svn_prompt_info() { + local _DISPLAY if in_svn; then if [ "x$SVN_SHOW_BRANCH" = "xtrue" ]; then unset SVN_SHOW_BRANCH _DISPLAY=$(svn_get_branch_name) else _DISPLAY=$(svn_get_repo_name) + _DISPLAY=$(omz_urldecode "${_DISPLAY}") fi echo "$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_PREFIX\ $ZSH_THEME_REPO_NAME_COLOR$_DISPLAY$ZSH_PROMPT_BASE_COLOR$ZSH_THEME_SVN_PROMPT_SUFFIX$ZSH_PROMPT_BASE_COLOR$(svn_dirty)$(svn_dirty_pwd)$ZSH_PROMPT_BASE_COLOR" - unset _DISPLAY fi } @@ -30,7 +31,7 @@ function svn_get_repo_name() { } function svn_get_branch_name() { - _DISPLAY=$( + local _DISPLAY=$( svn info 2> /dev/null | \ awk -F/ \ '/^URL:/ { \ @@ -49,7 +50,6 @@ function svn_get_branch_name() { else echo $_DISPLAY fi - unset _DISPLAY } function svn_get_rev_nr() { @@ -60,7 +60,7 @@ function svn_get_rev_nr() { function svn_dirty_choose() { if in_svn; then - root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'` + local root=`svn info 2> /dev/null | sed -n 's/^Working Copy Root Path: //p'` if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then # Grep exits with 0 when "One or more lines were selected", return "dirty". echo $1 @@ -77,7 +77,7 @@ function svn_dirty() { function svn_dirty_choose_pwd () { if in_svn; then - root=$PWD + local root=$PWD if $(svn status $root 2> /dev/null | command grep -Eq '^\s*[ACDIM!?L]'); then # Grep exits with 0 when "One or more lines were selected", return "dirty". echo $1 diff --git a/plugins/symfony2/symfony2.plugin.zsh b/plugins/symfony2/symfony2.plugin.zsh index e94280ed0..98a2321db 100644 --- a/plugins/symfony2/symfony2.plugin.zsh +++ b/plugins/symfony2/symfony2.plugin.zsh @@ -5,7 +5,7 @@ _symfony_console () { } _symfony2_get_command_list () { - `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^ ?[a-z]+/ { print $1 }' + `_symfony_console` --no-ansi | sed "1,/Available commands/d" | awk '/^ ?[^ ]+ / { print $1 }' } _symfony2 () { diff --git a/plugins/systemadmin/systemadmin.plugin.zsh b/plugins/systemadmin/systemadmin.plugin.zsh index 4ae70dfa7..8c2633355 100644 --- a/plugins/systemadmin/systemadmin.plugin.zsh +++ b/plugins/systemadmin/systemadmin.plugin.zsh @@ -140,12 +140,16 @@ d0() { # gather external ip address geteip() { - curl http://ifconfig.me + curl -s -S https://icanhazip.com } # determine local IP address getip() { - ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' + if (( ${+commands[ip]} )); then + ip addr | grep "inet " | grep -v '127.0.0.1' | awk '{print $2}' + else + ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}' + fi } # Clear zombie processes diff --git a/plugins/systemd/systemd.plugin.zsh b/plugins/systemd/systemd.plugin.zsh index 7d3db0f8e..07eb595a6 100644 --- a/plugins/systemd/systemd.plugin.zsh +++ b/plugins/systemd/systemd.plugin.zsh @@ -1,11 +1,12 @@ user_commands=( list-units is-active status show help list-unit-files - is-enabled list-jobs show-environment) + is-enabled list-jobs show-environment cat) sudo_commands=( start stop reload restart try-restart isolate kill reset-failed enable disable reenable preset mask unmask - link load cancel set-environment unset-environment) + link load cancel set-environment unset-environment + edit) for c in $user_commands; do; alias sc-$c="systemctl $c"; done for c in $sudo_commands; do; alias sc-$c="sudo systemctl $c"; done diff --git a/plugins/taskwarrior/taskwarrior.plugin.zsh b/plugins/taskwarrior/taskwarrior.plugin.zsh index c1830042e..5d1e6ffea 100644 --- a/plugins/taskwarrior/taskwarrior.plugin.zsh +++ b/plugins/taskwarrior/taskwarrior.plugin.zsh @@ -8,7 +8,7 @@ # TaskWarrior<http://taskwarrior.org/>. It uses the zsh tab completion # script (_task) distributed with TaskWarrior for the completion definitions. # -# Typing task[tabtab] will give you a list of current tasks, task 66[tabtab] +# Typing task [tabtab] will give you a list of current tasks, task 66[tabtab] # gives a list of available modifications for that task, etc. ################################################################################ diff --git a/plugins/terminalapp/terminalapp.plugin.zsh b/plugins/terminalapp/terminalapp.plugin.zsh index 6e47ee188..7c0c278b9 100644 --- a/plugins/terminalapp/terminalapp.plugin.zsh +++ b/plugins/terminalapp/terminalapp.plugin.zsh @@ -1,39 +1,6 @@ -# Set Apple Terminal.app resume directory -# based on this answer: http://superuser.com/a/315029 -# 2012-10-26: (javageek) Changed code using the updated answer - -# Tell the terminal about the working directory whenever it changes. -if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then - update_terminal_cwd() { - # Identify the directory using a "file:" scheme URL, including - # the host name to disambiguate local vs. remote paths. - - # Percent-encode the pathname. - local URL_PATH='' - { - # Use LANG=C to process text byte-by-byte. - local i ch hexch LANG=C - for ((i = 1; i <= ${#PWD}; ++i)); do - ch="$PWD[i]" - if [[ "$ch" =~ [/._~A-Za-z0-9-] ]]; then - URL_PATH+="$ch" - else - hexch=$(printf "%02X" "'$ch") - URL_PATH+="%$hexch" - fi - done - } - - local PWD_URL="file://$HOST$URL_PATH" - #echo "$PWD_URL" # testing - printf '\e]7;%s\a' "$PWD_URL" - } - - # Register the function so it is called whenever the working - # directory changes. - autoload add-zsh-hook - add-zsh-hook precmd update_terminal_cwd - - # Tell the terminal about the initial directory. - update_terminal_cwd -fi +# This file is intentionally empty. +# +# The terminalapp plugin is deprecated and may be removed in a future release. +# Its functionality has been folded in to the core lib/termsupport.zsh, which +# is loaded for all users. You can remove terminalapp from your $plugins list +# once all your systems are updated to the current version of Oh My Zsh. diff --git a/plugins/terraform/README.md b/plugins/terraform/README.md new file mode 100644 index 000000000..44e38a1c0 --- /dev/null +++ b/plugins/terraform/README.md @@ -0,0 +1,11 @@ +## atom + +Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently. + +### Requirements + + * [Terraform](https://terraform.io/) + +### Usage + + * Type `terraform` into your prompt and hit `TAB` to see available completion options diff --git a/plugins/terraform/_terraform b/plugins/terraform/_terraform new file mode 100644 index 000000000..11740dc48 --- /dev/null +++ b/plugins/terraform/_terraform @@ -0,0 +1,177 @@ +#compdef terraform + +local -a _terraform_cmds +_terraform_cmds=( + 'apply:Builds or changes infrastructure' + 'destroy:Destroy Terraform-managed infrastructure' + 'get:Download and install modules for the configuration' + 'graph:Create a visual graph of Terraform resources' + 'init:Initializes Terraform configuration from a module' + 'output:Read an output from a state file' + 'plan:Generate and show an execution plan' + 'pull:Refreshes the local state copy from the remote server' + 'push:Uploads the local state to the remote server' + 'refresh:Update local state file against real resources' + 'remote:Configures remote state management' + 'show:Inspect Terraform state or plan' + 'taint:Manually forcing a destroy and recreate on the next plan/apply' + 'version:Prints the Terraform version' +) + +__apply() { + _arguments \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \ + '-input=[(true) Ask for input for variables if not directly set.]' \ + '-no-color[If specified, output will not contain any color.]' \ + '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \ + '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \ + '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \ + '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \ + '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \ + '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]' +} + +__destroy() { + _arguments \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \ + '-force[If set, then the destroy confirmation will not be shown.]' \ + '-input=[(true) Ask for input for variables if not directly set.]' \ + '-no-color[If specified, output will not contain any color.]' \ + '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \ + '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \ + '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \ + '-target=[(resource) Instead of affecting "dependencies" will instead also destroy any resources that depend on the target(s) specified.]' \ + '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \ + '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]' +} + +__get() { + _arguments \ + '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]' +} + +__graph() { + _arguments \ + '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \ + '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \ + '-verbose[Generate a verbose, "worst-case" graph, with all nodes for potential operations in place.]' +} + +__init() { + _arguments \ + '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \ + '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \ + '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \ + '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \ + '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]' +} + +__output() { + _arguments \ + '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]' \ + '-module=[(module_name) The module path which has needed output. By default this is the root path. Other modules can be specified by a period-separated list.]' +} + +__plan() { + _arguments \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with" .backup" extension. Set to "-" to disable backup.]' \ + '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \ + '-detailed-exitcode[Return a detailed exit code when the command exits. When provided, this argument changes the exit codes and their meanings to provide more granular information about what the resulting plan contains]' \ + '-input=[(true) Ask for input for variables if not directly set.]' \ + '-module-depth=[(n) Specifies the depth of modules to show in the output. This does not affect the plan itself, only the output shown. By default, this is zero. -1 will expand all.]' \ + '-no-color[If specified, output will not contain any color.]' \ + '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \ + '-refresh=[(true) Update state prior to checking for differences.]' \ + '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]' \ + '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \ + '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \ + '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]' +} + +__push() { + _arguments \ + '-atlas-address=[(url) An alternate address to an Atlas instance. Defaults to https://atlas.hashicorp.com.]' \ + '-upload-modules=[(true) If true (default), then the modules being used are all locked at their current checkout and uploaded completely to Atlas. This prevents Atlas from running terraform get for you.]' \ + '-name=[(name) Name of the infrastructure configuration in Atlas. The format of this is: "username/name" so that you can upload configurations not just to your account but to other accounts and organizations. This setting can also be set in the configuration in the Atlas section.]' \ + '-no-color[Disables output with coloring]' \ + '-overwrite=[(foo) Marks a specific variable to be updated on Atlas. Normally, if a variable is already set in Atlas, Terraform will not send the local value (even if it is different). This forces it to send the local value to Atlas. This flag can be repeated multiple times.]' \ + '-token=[(token) Atlas API token to use to authorize the upload. If blank or unspecified, the ATLAS_TOKEN environmental variable will be used.]' \ + '-var=[("foo=bar") Set the value of a variable for the Terraform configuration.]' \ + '-var-file=[(foo) Set the value of variables using a variable file.]' \ + '-vcs=[(true) If true (default), then Terraform will detect if a VCS is in use, such as Git, and will only upload files that are comitted to version control. If no version control system is detected, Terraform will upload all files in path (parameter to the command).]' +} + +__refresh() { + _arguments \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \ + '-no-color[If specified, output will not contain any color.]' \ + '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \ + '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]' \ + '-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]' \ + '-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \ + '-var-file=[(path) Set variables in the Terraform configuration from a file. If "terraform.tfvars" is present, it will be automatically loaded if this flag is not specified.]' +} + +__remote() { + _arguments \ + '-address=[(url) URL of the remote storage server. Required for HTTP backend, optional for Atlas and Consul.]' \ + '-access-token=[(token) Authentication token for state storage server. Required for Atlas backend, optional for Consul.]' \ + '-backend=[(atlas) Specifies the type of remote backend. Must be one of Atlas, Consul, or HTTP. Defaults to atlas.]' \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \ + '-disable[Disables remote state management and migrates the state to the -state path.]' \ + '-name=[(name) Name of the state file in the state storage server. Required for Atlas backend.]' \ + '-path=[(path) Path of the remote state in Consul. Required for the Consul backend.]' \ + '-pull=[(true) Controls if the remote state is pulled before disabling. This defaults to true to ensure the latest state is cached before disabling.]' \ + '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' +} + +__show() { + _arguments \ + '-module-depth=[(n) The maximum depth to expand modules. By default this is zero, which will not expand modules at all.]' \ + '-no-color[If specified, output will not contain any color.]' +} + +__taint() { + _arguments \ + '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \ + '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]' \ + '-module=[(path) The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \ + '-no-color[If specified, output will not contain any color.]' \ + '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]' \ + '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]' +} + +_arguments '*:: :->command' + +if (( CURRENT == 1 )); then + _describe -t commands "terraform command" _terraform_cmds + return +fi + +local -a _command_args +case "$words[1]" in + apply) + __apply ;; + destroy) + __destroy ;; + get) + __get ;; + graph) + __graph ;; + init) + __init ;; + output) + __output ;; + plan) + __plan ;; + push) + __push ;; + refresh) + __refresh ;; + remote) + __remote ;; + show) + __show ;; + taint) + __taint ;; +esac diff --git a/plugins/thefuck/README.md b/plugins/thefuck/README.md new file mode 100644 index 000000000..a9b7550d7 --- /dev/null +++ b/plugins/thefuck/README.md @@ -0,0 +1,9 @@ +# The Fuck + +[The Fuck](https://github.com/nvbn/thefuck) plugin — magnificent app which corrects your previous console command. + +## Usage +Press `ESC` twice to correct previous console command. + +## Notes +`Esc`-`Esc` key binding conflicts with [sudo](https://github.com/robbyrussell/oh-my-zsh/tree/master/plugins/sudo) plugin. diff --git a/plugins/thefuck/thefuck.plugin.zsh b/plugins/thefuck/thefuck.plugin.zsh new file mode 100644 index 000000000..765e2b9a5 --- /dev/null +++ b/plugins/thefuck/thefuck.plugin.zsh @@ -0,0 +1,17 @@ +if [[ -z $commands[thefuck] ]]; then + echo 'thefuck is not installed, you should "pip install thefuck" first' + return -1 +fi + +# Register alias +eval "$(thefuck --alias)" + +fuck-command-line() { + local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)" + [[ -z $FUCK ]] && echo -n -e "\a" && return + BUFFER=$FUCK + zle end-of-line +} +zle -N fuck-command-line +# Defined shortcut keys: [Esc] [Esc] +bindkey "\e\e" fuck-command-line diff --git a/plugins/tugboat/_tugboat b/plugins/tugboat/_tugboat new file mode 100644 index 000000000..6bf736920 --- /dev/null +++ b/plugins/tugboat/_tugboat @@ -0,0 +1,106 @@ +#compdef tugboat +#autoload + +# Tugboat zsh autocompletion + + +local -a _commands +_commands=( + 'add-key:[NAME] Upload an ssh public key.' + 'authorize:Authorize a DigitalOcean account with tugboat.' + 'create:[NAME] Create a droplet.' + 'destroy:[FUZZY_NAME] Destroy a droplet.' + 'destroy_image:[FUZZY_NAME] Destroy an image.' + 'droplets:Retrieve a list of your droplets.' + 'halt:[FUZZY_NAME] Shutdown a droplet.' + 'help:[COMMAND] Describe commands or a specific command.' + 'images:Retrieve a list of your images.' + 'info:[FUZZY_NAME] [OPTIONS] Show a droplets information.' + 'info_image:[FUZZY_NAME] [OPTIONS] Show an images information.' + 'keys:Show available SSH keys.' + 'password-reset:[FUZZY_NAME] Reset root password.' + 'rebuild:[FUZZY_NAME] [IMAGE_NAME] Rebuild a droplet.' + 'regions:Show regions.' + 'resize:[FUZZY_NAME -s, --size=N] Resize a droplet.' + 'restart:[FUZZY_NAME] Restart a droplet.' + 'sizes:Show available droplet sizes.' + 'snapshot:[SNAPSHOT_NAME] [FUZZY_NAME] [OPTIONS] Queue a snapshot of the droplet.' + 'ssh:[FUZZY_NAME] SSH into a droplet.' + 'start:[FUZZY_NAME] Start a droplet.' + 'verify:Check your DigitalOcean credentials.' + 'version:Show version.' + 'wait:[FUZZY_NAME] Wait for a droplet to reach a state.' +) + +local -a _create_arguments +_create_arguments=( + '-s:[--size=N] The size_id of the droplet' + '-i:[--image=N] The image_id of the droplet' + '-r:[--region=N] The region_id of the droplet' + '-k:[--keys=KEYS] A comma separated list of SSH key ids to add to the droplet' + '-p:[--private-networking] Enable private networking on the droplet' + '-b:[--backups-enabled] Enable backups on the droplet' + '-q:[--quiet]' +) + +__task_list () +{ + local expl + declare -a tasks + + arguments=(add-key authorize create destroy destroy_image droplets halt help images info info_image keys password-reset rebuild regions resize restart sizes snapshot ssh start verify version wait) + + _wanted tasks expl 'help' compadd $arguments +} + +__droplets_list () +{ + _wanted application expl 'command' compadd $(command tugboat droplets | cut -d " " -f1) +} + +__tugboat-create () +{ + local curcontext="$curcontext" state line + typeset -A opt_args + + _arguments -C \ + ':command:->command' \ + '*::options:->options' + + case $state in + (command) + _describe -t commands "gem subcommand" _create_arguments + return + ;; + esac +} + +local curcontext="$curcontext" state line +typeset -A opt_args + +_arguments -C \ + ':command:->command' \ + '*::options:->options' + +case $state in + (command) + _describe -t commands "gem subcommand" _commands + return + ;; + + (options) + case $line[1] in + (help) + _arguments ':feature:__task_list' + ;; + + (ssh) + _arguments ':feature:__droplets_list' + ;; + + (create) + _arguments ':feature:__tugboat-create' + ;; + esac + ;; +esac diff --git a/plugins/ubuntu/ubuntu.plugin.zsh b/plugins/ubuntu/ubuntu.plugin.zsh index 0211d3374..f08853643 100644 --- a/plugins/ubuntu/ubuntu.plugin.zsh +++ b/plugins/ubuntu/ubuntu.plugin.zsh @@ -3,6 +3,7 @@ # https://github.com/dbb # https://github.com/Mappleconfusers # Nicolas Jonas nextgenthemes.com +# https://github.com/loctauxphilippe # # Debian, Ubuntu and friends related zsh aliases and functions for zsh @@ -28,6 +29,7 @@ compdef _ppap ppap='sudo ppa-purge' alias ag='sudo apt-get' # age - but without sudo alias aga='sudo apt-get autoclean' # aac +alias agar='sudo apt-get autoremove' alias agb='sudo apt-get build-dep' # abd alias agc='sudo apt-get clean' # adc alias agd='sudo apt-get dselect-upgrade' # ads @@ -38,9 +40,11 @@ alias agu='sudo apt-get update' # ad alias agud='sudo apt-get update && sudo apt-get dist-upgrade' #adu alias agug='sudo apt-get upgrade' # ag alias aguu='sudo apt-get update && sudo apt-get upgrade' #adg +alias agar='sudo apt-get autoremove' compdef _ag ag='sudo apt-get' compdef _aga aga='sudo apt-get autoclean' +compdef _agar agar='sudo apt-get autoremove' compdef _agb agb='sudo apt-get build-dep' compdef _agc agc='sudo apt-get clean' compdef _agd agd='sudo apt-get dselect-upgrade' @@ -51,6 +55,7 @@ compdef _agu agu='sudo apt-get update' compdef _agud agud='sudo apt-get update && sudo apt-get dist-upgrade' compdef _agug agug='sudo apt-get upgrade' compdef _aguu aguu='sudo apt-get update && sudo apt-get upgrade' +compdef _agar agar='sudo apt-get autoremove' # Remove ALL kernel images and headers EXCEPT the one in use alias kclean='sudo aptitude remove -P ?and(~i~nlinux-(ima|hea) \ @@ -65,7 +70,7 @@ alias mydeb='time dpkg-buildpackage -rfakeroot -us -uc' # apt-add-repository with automatic install/upgrade of the desired package # Usage: aar ppa:xxxxxx/xxxxxx [packagename] -# If packagename is not given as 2nd arument the function will ask for it and guess the defaupt by taking +# If packagename is not given as 2nd argument the function will ask for it and guess the default by taking # the part after the / from the ppa name wich is sometimes the right name for the package you want to install aar() { if [ -n "$2" ]; then diff --git a/plugins/vi-mode/README.md b/plugins/vi-mode/README.md new file mode 100644 index 000000000..03e67cca2 --- /dev/null +++ b/plugins/vi-mode/README.md @@ -0,0 +1,75 @@ +vi-mode +======= +This plugin increase `vi-like` zsh functionality. + +Use `ESC` or `CTRL-[` to enter `Normal mode`. + + +History +------- + +- `ctrl-p` : Previous command in history +- `ctrl-n` : Next command in history +- `/` : Search backward in history +- `n` : Repeat the last `/` + + +Mode indicators +--------------- + +*Normal mode* is indicated with red `<<<` mark at the right prompt, when it +wasn't defined by theme. + + +Vim edition +----------- + +- `v` : Edit current command line in Vim + + +Movement +-------- + +- `$` : To the end of the line +- `^` : To the first non-blank character of the line +- `0` : To the first character of the line +- `w` : [count] words forward +- `W` : [count] WORDS forward +- `e` : Forward to the end of word [count] inclusive +- `E` : Forward to the end of WORD [count] inclusive +- `b` : [count] words backward +- `B` : [count] WORDS backward +- `t{char}` : Till before [count]'th occurrence of {char} to the right +- `T{char}` : Till before [count]'th occurrence of {char} to the left +- `f{char}` : To [count]'th occurrence of {char} to the right +- `F{char}` : To [count]'th occurrence of {char} to the left +- `;` : Repeat latest f, t, F or T [count] times +- `,` : Repeat latest f, t, F or T in opposite direction + + +Insertion +--------- + +- `i` : Insert text before the cursor +- `I` : Insert text before the first character in the line +- `a` : Append text after the cursor +- `A` : Append text at the end of the line +- `o` : Insert new command line below the current one +- `O` : Insert new command line above the current one + + +Delete and Insert +----------------- + +- `ctrl-h` : While in *Insert mode*: delete character after the cursor +- `ctrl-w` : While in *Insert mode*: delete word after the cursor +- `d{motion}` : Delete text that {motion} moves over +- `dd` : Delete line +- `D` : Delete characters under the cursor until the end of the line +- `c{motion}` : Delete {motion} text and start insert +- `cc` : Delete line and start insert +- `C` : Delete to the end of the line and start insert +- `r{char}` : Replace the character under the cursor with {char} +- `R` : Enter replace mode: Each character replaces existing one +- `x` : Delete [count] characters under and after the cursor +- `X` : Delete [count] characters before the cursor diff --git a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh index 5faa1a823..6cd30732e 100644 --- a/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh +++ b/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh @@ -1,45 +1,63 @@ virtualenvwrapper='virtualenvwrapper.sh' if (( $+commands[$virtualenvwrapper] )); then - source ${${virtualenvwrapper}:c} + function { + setopt local_options + unsetopt equals + source ${${virtualenvwrapper}:c} + } elif [[ -f "/etc/bash_completion.d/virtualenvwrapper" ]]; then - virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper" - source "/etc/bash_completion.d/virtualenvwrapper" + function { + setopt local_options + unsetopt equals + virtualenvwrapper="/etc/bash_completion.d/virtualenvwrapper" + source "/etc/bash_completion.d/virtualenvwrapper" + } else - print "zsh virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\ + print "[oh-my-zsh] virtualenvwrapper plugin: Cannot find ${virtualenvwrapper}.\n"\ "Please install with \`pip install virtualenvwrapper\`" >&2 return fi if ! type workon &>/dev/null; then - print "zsh virtualenvwrapper plugin: shell function 'workon' not defined.\n"\ + print "[oh-my-zsh] virtualenvwrapper plugin: shell function 'workon' not defined.\n"\ "Please check ${virtualenvwrapper}" >&2 return fi if [[ "$WORKON_HOME" == "" ]]; then - print "\$WORKON_HOME is not defined so ZSH plugin virtualenvwrapper will not work" >&2 + print "[oh-my-zsh] \$WORKON_HOME is not defined so plugin virtualenvwrapper will not work" >&2 return fi if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then - # Automatically activate Git projects's virtual environments based on the + # Automatically activate Git projects or other customized virtualenvwrapper projects based on the # directory name of the project. Virtual environment name can be overridden - # by placing a .venv file in the project root with a virtualenv name in it + # by placing a .venv file in the project root with a virtualenv name in it. function workon_cwd { - if [ ! $WORKON_CWD ]; then - WORKON_CWD=1 + if [[ -z "$WORKON_CWD" ]]; then + local WORKON_CWD=1 # Check if this is a Git repo - PROJECT_ROOT=`git rev-parse --show-toplevel 2> /dev/null` - if (( $? != 0 )); then + local GIT_REPO_ROOT="" + local GIT_TOPLEVEL="$(git rev-parse --show-toplevel 2> /dev/null)" + if [[ $? == 0 ]]; then + GIT_REPO_ROOT="$GIT_TOPLEVEL" + fi + # Get absolute path, resolving symlinks + local PROJECT_ROOT="${PWD:A}" + while [[ "$PROJECT_ROOT" != "/" && ! -e "$PROJECT_ROOT/.venv" \ + && ! -d "$PROJECT_ROOT/.git" && "$PROJECT_ROOT" != "$GIT_REPO_ROOT" ]]; do + PROJECT_ROOT="${PROJECT_ROOT:h}" + done + if [[ "$PROJECT_ROOT" == "/" ]]; then PROJECT_ROOT="." fi # Check for virtualenv name override if [[ -f "$PROJECT_ROOT/.venv" ]]; then - ENV_NAME=`cat "$PROJECT_ROOT/.venv"` + ENV_NAME="$(cat "$PROJECT_ROOT/.venv")" elif [[ -f "$PROJECT_ROOT/.venv/bin/activate" ]];then ENV_NAME="$PROJECT_ROOT/.venv" elif [[ "$PROJECT_ROOT" != "." ]]; then - ENV_NAME=`basename "$PROJECT_ROOT"` + ENV_NAME="${PROJECT_ROOT:t}" else ENV_NAME="" fi @@ -57,8 +75,6 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then # Note: this only happens if the virtualenv was activated automatically deactivate && unset CD_VIRTUAL_ENV fi - unset PROJECT_ROOT - unset WORKON_CWD fi } diff --git a/plugins/vundle/vundle.plugin.zsh b/plugins/vundle/vundle.plugin.zsh index 830774fe3..0f071597a 100644 --- a/plugins/vundle/vundle.plugin.zsh +++ b/plugins/vundle/vundle.plugin.zsh @@ -1,27 +1,27 @@ function vundle-init () { - if [ ! -d ~/.vim/bundle/vundle/ ] + if [ ! -d ~/.vim/bundle/Vundle.vim/ ] then - mkdir -p ~/.vim/bundle/vundle/ + mkdir -p ~/.vim/bundle/Vundle.vim/ fi - if [ ! -d ~/.vim/bundle/vundle/.git ] && [ ! -f ~/.vim/bundle/vundle/.git ] + if [ ! -d ~/.vim/bundle/Vundle.vim/.git ] && [ ! -f ~/.vim/bundle/Vundle.vim/.git ] then - git clone http://github.com/gmarik/vundle.git ~/.vim/bundle/vundle - echo "\n\tRead about vim configuration for vundle at https://github.com/gmarik/vundle\n" + git clone git://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim + echo "\n\tRead about vim configuration for vundle at https://github.com/VundleVim/Vundle.vim\n" fi } function vundle () { vundle-init - vim -c "execute \"BundleInstall\" | q | q" + vim -c "execute \"PluginInstall\" | qa" } function vundle-update () { vundle-init - vim -c "execute \"BundleInstall!\" | q | q" + vim -c "execute \"PluginInstall!\" | qa" } function vundle-clean () { vundle-init - vim -c "execute \"BundleClean!\" | q | q" + vim -c "execute \"PluginClean!\" | qa" } diff --git a/plugins/web-search/web-search.plugin.zsh b/plugins/web-search/web-search.plugin.zsh index 572427b0b..369a0e680 100644 --- a/plugins/web-search/web-search.plugin.zsh +++ b/plugins/web-search/web-search.plugin.zsh @@ -11,18 +11,10 @@ function web_search() { yahoo "https://search.yahoo.com/search?p=" duckduckgo "https://www.duckduckgo.com/?q=" yandex "https://yandex.ru/yandsearch?text=" + github "https://github.com/search?q=" + baidu "https://www.baidu.com/s?wd=" ) - # define the open command - case "$OSTYPE" in - darwin*) open_cmd="open" ;; - cygwin*) open_cmd="cygstart" ;; - linux*) open_cmd="xdg-open" ;; - *) echo "Platform $OSTYPE not supported" - return 1 - ;; - esac - # check whether the search engine is supported if [[ -z "$urls[$1]" ]]; then echo "Search engine $1 not supported." @@ -40,7 +32,7 @@ function web_search() { url="${(j://:)${(s:/:)urls[$1]}[1,2]}" fi - nohup $open_cmd "$url" &>/dev/null + open_command "$url" } @@ -49,6 +41,8 @@ alias google='web_search google' alias yahoo='web_search yahoo' alias ddg='web_search duckduckgo' alias yandex='web_search yandex' +alias github='web_search github' +alias baidu='web_search baidu' #add your own !bang searches here alias wiki='web_search duckduckgo \!w' diff --git a/plugins/zeus/README.md b/plugins/zeus/README.md index 8964eaaec..451880049 100644 --- a/plugins/zeus/README.md +++ b/plugins/zeus/README.md @@ -42,12 +42,15 @@ * `zsw` aliases `rm .zeus.sock` * `zweep` aliases `rm .zeus.sock` -`zdbr` aliases `zeus rake db:reset db:test:prepare` -`zdbreset` aliases `zeus rake db:reset db:test:prepare` +* `zdbr` aliases `zeus rake db:reset db:test:prepare` +* `zdbreset` aliases `zeus rake db:reset db:test:prepare` -`zdbm` aliases `zeus rake db:migrate db:test:prepare` -`zdbmigrate` aliases `zeus rake db:migrate db:test:prepare` +* `zdbm` aliases `zeus rake db:migrate db:test:prepare` +* `zdbmigrate` aliases `zeus rake db:migrate db:test:prepare` -`zdbc` aliases `zeus rake db:create` +* `zdbc` aliases `zeus rake db:create` -`zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare` +* `zdbcm` aliases `zeus rake db:create db:migrate db:test:prepare` + +## Installation +Add zeus to the plugins line of your `.zshconfig` file (e.g. `plugins=(rails git zeus)`) diff --git a/plugins/zeus/zeus.plugin.zsh b/plugins/zeus/zeus.plugin.zsh index 5ec9fa579..0c01083a5 100644 --- a/plugins/zeus/zeus.plugin.zsh +++ b/plugins/zeus/zeus.plugin.zsh @@ -19,8 +19,8 @@ alias zsr='zeus server' alias zerver='zeus server' # Rake -alias zr='zeus rake' -alias zake='zeus rake' +alias zr='noglob zeus rake' +alias zake='noglob zeus rake' # Generate alias zg='zeus generate' diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 763288dfd..44e8b0d1b 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -10,6 +10,10 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" +# Uncomment the following line to use hyphen-insensitive completion. Case +# sensitive completion must be off. _ and - will be interchangeable. +# HYPHEN_INSENSITIVE="true" + # Uncomment the following line to disable bi-weekly auto-update checks. # DISABLE_AUTO_UPDATE="true" diff --git a/themes/adben.zsh-theme b/themes/adben.zsh-theme index 212b823a5..e4774cf0e 100644 --- a/themes/adben.zsh-theme +++ b/themes/adben.zsh-theme @@ -42,7 +42,7 @@ GREEN_BASE_START="${PR_RESET}${PR_GREY}>${PR_RESET}${PR_GREEN}>${PR_BRIGHT_GREEN GREEN_START_P1="${PR_RESET}${GREEN_BASE_START}${PR_RESET} " DIVISION="${PR_RESET}${PR_RED} < ${PR_RESET}" VCS_DIRTY_COLOR="${PR_RESET}${PR_YELLOW}" -Vcs_CLEAN_COLOR="${PR_RESET}${PR_GREEN}" +VCS_CLEAN_COLOR="${PR_RESET}${PR_GREEN}" VCS_SUFIX_COLOR="${PR_RESET}${PR_RED}› ${PR_RESET}" # ########## COLOR ########### # ########## SVN ########### diff --git a/themes/agnoster.zsh-theme b/themes/agnoster.zsh-theme index 8c7be6e01..3a0c58b89 100644 --- a/themes/agnoster.zsh-theme +++ b/themes/agnoster.zsh-theme @@ -26,7 +26,13 @@ # A few utility functions to make it easy and re-usable to draw segmented prompts CURRENT_BG='NONE' -SEGMENT_SEPARATOR='' + +# Fix odd char on mac +if [[ `uname` == 'Darwin' ]]; then + SEGMENT_SEPARATOR='\ue0b0' +else + SEGMENT_SEPARATOR='' +fi # Begin a segment # Takes two arguments, background and foreground. Both can be omitted, @@ -126,7 +132,7 @@ prompt_hg() { if `hg st | grep -q "^\?"`; then prompt_segment red black st='±' - elif `hg st | grep -q "^(M|A)"`; then + elif `hg st | grep -q "^[MA]"`; then prompt_segment yellow black st='±' else diff --git a/themes/avit.zsh-theme b/themes/avit.zsh-theme index a21a9c8c4..65466b82f 100644 --- a/themes/avit.zsh-theme +++ b/themes/avit.zsh-theme @@ -38,34 +38,32 @@ function _ruby_version() { # Determine the time since last commit. If branch is clean, # use a neutral color, otherwise colors will vary according to time. function _git_time_since_commit() { - if git rev-parse --git-dir > /dev/null 2>&1; then - # Only proceed if there is actually a commit. - if [[ $(git log 2>&1 > /dev/null | grep -c "^fatal: bad default revision") == 0 ]]; then - # Get the last commit. - last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null) - now=$(date +%s) - seconds_since_last_commit=$((now-last_commit)) - - # Totals - minutes=$((seconds_since_last_commit / 60)) - hours=$((seconds_since_last_commit/3600)) - - # Sub-hours and sub-minutes - days=$((seconds_since_last_commit / 86400)) - sub_hours=$((hours % 24)) - sub_minutes=$((minutes % 60)) - - if [ $hours -gt 24 ]; then - commit_age="${days}d" - elif [ $minutes -gt 60 ]; then - commit_age="${sub_hours}h${sub_minutes}m" - else - commit_age="${minutes}m" - fi - - color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL - echo "$color$commit_age%{$reset_color%}" +# Only proceed if there is actually a commit. + if git log -1 > /dev/null 2>&1; then + # Get the last commit. + last_commit=$(git log --pretty=format:'%at' -1 2> /dev/null) + now=$(date +%s) + seconds_since_last_commit=$((now-last_commit)) + + # Totals + minutes=$((seconds_since_last_commit / 60)) + hours=$((seconds_since_last_commit/3600)) + + # Sub-hours and sub-minutes + days=$((seconds_since_last_commit / 86400)) + sub_hours=$((hours % 24)) + sub_minutes=$((minutes % 60)) + + if [ $hours -gt 24 ]; then + commit_age="${days}d" + elif [ $minutes -gt 60 ]; then + commit_age="${sub_hours}h${sub_minutes}m" + else + commit_age="${minutes}m" fi + + color=$ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL + echo "$color$commit_age%{$reset_color%}" fi } @@ -99,4 +97,3 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[grey]%}" export LSCOLORS="exfxcxdxbxegedabagacad" export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:' export GREP_COLOR='1;33' - diff --git a/themes/candy-kingdom.zsh-theme b/themes/candy-kingdom.zsh-theme index 889128758..9d2103926 100644 --- a/themes/candy-kingdom.zsh-theme +++ b/themes/candy-kingdom.zsh-theme @@ -13,7 +13,7 @@ patches: <patches|join( → )|pre_applied(%{$fg[yellow]%})|post_applied(%{$reset } function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} } PROMPT=' diff --git a/themes/fino-time.zsh-theme b/themes/fino-time.zsh-theme index 67b6b6e08..9b1db3a08 100644 --- a/themes/fino-time.zsh-theme +++ b/themes/fino-time.zsh-theme @@ -21,7 +21,7 @@ function prompt_char { } function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} } diff --git a/themes/fino.zsh-theme b/themes/fino.zsh-theme index 50d41e899..6eec097f5 100644 --- a/themes/fino.zsh-theme +++ b/themes/fino.zsh-theme @@ -17,7 +17,7 @@ function prompt_char { } function box_name { - [ -f ~/.box-name ] && cat ~/.box-name || echo $SHORT_HOST || echo $HOST + [ -f ~/.box-name ] && cat ~/.box-name || echo ${SHORT_HOST:-$HOST} } local ruby_env='' diff --git a/themes/michelebologna.zsh-theme b/themes/michelebologna.zsh-theme index a7599c8f5..fec243873 100644 --- a/themes/michelebologna.zsh-theme +++ b/themes/michelebologna.zsh-theme @@ -1,44 +1,74 @@ -# reference colors -GREEN="%{$fg_bold[green]%}" -RED="%{$fg_bold[red]%}" -CYAN="%{$fg_bold[cyan]%}" -YELLOW="%{$fg_bold[yellow]%}" -BLUE="%{$fg_bold[blue]%}" -MAGENTA="%{$fg_bold[magenta]%}" -WHITE="%{$fg_bold[white]%}" - -COLOR_ARRAY=($GREEN $RED $CYAN $YELLOW $BLUE $MAGENTA $WHITE) - -# color reset -RESET_COLOR="%{$reset_color%}" - -# which color should be applied? -USERNAME_NORMAL_COLOR=$WHITE -USERNAME_ROOT_COLOR=$RED -HOSTNAME_NORMAL_COLOR=$BLUE -# uncomment next line if you want auto-generated hostname color -#for i in $HOST; HOSTNAME_NORMAL_COLOR=$COLOR_ARRAY[$[((#i))%7+1]] -HOSTNAME_ROOT_COLOR=$RED -HOSTNAME_COLOR=%(!.$HOSTNAME_ROOT_COLOR.$HOSTNAME_NORMAL_COLOR) -CURRENT_DIR_COLOR=$CYAN - -# zsh commands -USERNAME_COMMAND="%n" -HOSTNAME_COMMAND="%m" -CURRENT_DIR="%~" - -# output: colors + commands -USERNAME_OUTPUT="%(!..$USERNAME_NORMAL_COLOR$USERNAME_COMMAND$RESET_COLOR@)" -HOSTNAME_OUTPUT="$HOSTNAME_COLOR$HOSTNAME_COMMAND$RESET_COLOR" -CURRENT_DIR_OUTPUT="$CURRENT_DIR_COLOR$CURRENT_DIR" -LAST_COMMAND_OUTPUT="%(?.%(!.$RED.$GREEN).$YELLOW)" - -# git theming -ZSH_THEME_GIT_PROMPT_PREFIX="(" +# Michele Bologna's theme +# http://michelebologna.net +# +# This a theme for oh-my-zsh. Features a colored prompt with: +# * username@host: [jobs] [git] workdir % +# * hostname color is based on hostname characters. When using as root, the +# prompt shows only the hostname in red color. +# * [jobs], if applicable, counts the number of suspended jobs tty +# * [git], if applicable, represents the status of your git repo (more on that +# later) +# * '%' prompt will be green if last command return value is 0, yellow otherwise. +# +# git prompt is inspired by official git contrib prompt: +# https://github.com/git/git/tree/master/contrib/completion/git-prompt.sh +# and it adds: +# * the current branch +# * '%' if there are untracked files +# * '$' if there are stashed changes +# * '*' if there are modified files +# * '+' if there are added files +# * '<' if local repo is behind remote repo +# * '>' if local repo is ahead remote repo +# * '=' if local repo is equal to remote repo (in sync) +# * '<>' if local repo is diverged + +local green="%{$fg_bold[green]%}" +local red="%{$fg_bold[red]%}" +local cyan="%{$fg_bold[cyan]%}" +local yellow="%{$fg_bold[yellow]%}" +local blue="%{$fg_bold[blue]%}" +local magenta="%{$fg_bold[magenta]%}" +local white="%{$fg_bold[white]%}" +local reset="%{$reset_color%}" + +local -a color_array +color_array=($green $red $cyan $yellow $blue $magenta $white) + +local username_normal_color=$white +local username_root_color=$red +local hostname_root_color=$red + +# calculating hostname color with hostname characters +for i in `hostname`; local hostname_normal_color=$color_array[$[((#i))%7+1]] +local -a hostname_color +hostname_color=%(!.$hostname_root_color.$hostname_normal_color) + +local current_dir_color=$blue +local username_command="%n" +local hostname_command="%m" +local current_dir="%~" + +local username_output="%(!..$username_normal_color$username_command$reset@)" +local hostname_output="$hostname_color$hostname_command$reset" +local current_dir_output="$current_dir_color$current_dir$reset" +local jobs_bg="${red}fg: %j$reset" +local last_command_output="%(?.%(!.$red.$green).$yellow)" + +ZSH_THEME_GIT_PROMPT_PREFIX="" ZSH_THEME_GIT_PROMPT_SUFFIX="" -ZSH_THEME_GIT_PROMPT_DIRTY=")$RED*" -ZSH_THEME_GIT_PROMPT_CLEAN=")" +ZSH_THEME_GIT_PROMPT_DIRTY="" +ZSH_THEME_GIT_PROMPT_CLEAN="" +ZSH_THEME_GIT_PROMPT_UNTRACKED="%%" +ZSH_THEME_GIT_PROMPT_MODIFIED="*" +ZSH_THEME_GIT_PROMPT_ADDED="+" +ZSH_THEME_GIT_PROMPT_STASHED="$" +ZSH_THEME_GIT_PROMPT_EQUAL_REMOTE="=" +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=">" +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE="<" +ZSH_THEME_GIT_PROMPT_DIVERGED_REMOTE="<>" -# wrap all together -PROMPT='$USERNAME_OUTPUT$HOSTNAME_OUTPUT:$CURRENT_DIR_OUTPUT $LAST_COMMAND_OUTPUT%#$RESET_COLOR ' -RPROMPT='%1(j.fg: [%j].) $GREEN$(git_prompt_info)$RESET_COLOR [%@]' +PROMPT='$username_output$hostname_output:$current_dir_output%1(j. [$jobs_bg].)' +PROMPT+='$(__git_ps1)' +PROMPT+=" $last_command_output%#$reset " +RPROMPT='' diff --git a/themes/minimal.zsh-theme b/themes/minimal.zsh-theme index a2a16031f..e05df9c9b 100644 --- a/themes/minimal.zsh-theme +++ b/themes/minimal.zsh-theme @@ -1,18 +1,24 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[white]%}[" ZSH_THEME_GIT_PROMPT_SUFFIX="" -ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$reset_color%}]%{$reset_color%} " +ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}●%{$fg[white]%}]%{$reset_color%} " ZSH_THEME_GIT_PROMPT_CLEAN="]%{$reset_color%} " ZSH_THEME_SVN_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX ZSH_THEME_SVN_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX ZSH_THEME_SVN_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY ZSH_THEME_SVN_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN +ZSH_THEME_HG_PROMPT_PREFIX=$ZSH_THEME_GIT_PROMPT_PREFIX +ZSH_THEME_HG_PROMPT_SUFFIX=$ZSH_THEME_GIT_PROMPT_SUFFIX +ZSH_THEME_HG_PROMPT_DIRTY=$ZSH_THEME_GIT_PROMPT_DIRTY +ZSH_THEME_HG_PROMPT_CLEAN=$ZSH_THEME_GIT_PROMPT_CLEAN vcs_status() { - if [[ ( $(whence in_svn) != "" ) && ( $(in_svn) == 1 ) ]]; then + if [[ $(whence in_svn) != "" ]] && in_svn; then svn_prompt_info + elif [[ $(whence in_hg) != "" ]] && in_hg; then + hg_prompt_info else git_prompt_info fi } -PROMPT='%2~ $(vcs_status)»%b '
\ No newline at end of file +PROMPT='%2~ $(vcs_status)»%b ' diff --git a/themes/strug.zsh-theme b/themes/strug.zsh-theme new file mode 100644 index 000000000..89b56b008 --- /dev/null +++ b/themes/strug.zsh-theme @@ -0,0 +1,25 @@ +# terminal coloring +export CLICOLOR=1 +export LSCOLORS=dxFxCxDxBxegedabagacad + +local git_branch='$(git_prompt_info)%{$reset_color%}$(git_remote_status)' + +PROMPT="%{$fg[green]%}╭─%n@%m %{$reset_color%}%{$fg[yellow]%}in %~ %{$reset_color%}${git_branch} +%{$fg[green]%}╰\$ %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[yellow]%}on " +ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_DIRTY="%{$reset_color%}%{$fg[red]%} ✘ %{$reset_color%}" +ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[green]%} ✔ %{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_DETAILED=true +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_PREFIX="%{$fg[yellow]%}(" +ZSH_THEME_GIT_PROMPT_REMOTE_STATUS_SUFFIX="%{$fg[yellow]%})%{$reset_color%}" + +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE=" +" +ZSH_THEME_GIT_PROMPT_AHEAD_REMOTE_COLOR=%{$fg[green]%} + +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE=" -" +ZSH_THEME_GIT_PROMPT_BEHIND_REMOTE_COLOR=%{$fg[red]%} + diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index b2b356e0c..5afd83c1e 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -41,10 +41,9 @@ then then _upgrade_zsh else - echo "[Oh My Zsh] Would you like to check for updates?" - echo "Type Y to update oh-my-zsh: \c" + echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c" read line - if [ "$line" = Y ] || [ "$line" = y ]; then + if [ "$line" = Y ] || [ "$line" = y ] || [ -z "$line" ]; then _upgrade_zsh else _update_zsh_update diff --git a/tools/install.sh b/tools/install.sh index bd4c55749..aebd28371 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -1,5 +1,12 @@ set -e +CHECK_ZSH_INSTALLED=$(grep /zsh$ /etc/shells | wc -l) +if [ ! $CHECK_ZSH_INSTALLED -ge 1 ]; then + echo "\033[0;33m Zsh is not installed!\033[0m Please install zsh first!" + exit +fi +unset CHECK_ZSH_INSTALLED + if [ ! -n "$ZSH" ]; then ZSH=~/.oh-my-zsh fi @@ -9,6 +16,13 @@ if [ -d "$ZSH" ]; then exit fi +# Prevent the cloned repository from having insecure permissions. Failing to do +# so causes compinit() calls to fail with "command not found: compdef" errors +# for users with insecure umasks (e.g., "002", allowing group writability). Note +# that this will be ignored under Cygwin by default, as Windows ACLs take +# precedence over umasks except for filesystems mounted with option "noacl". +umask g-w,o-w + echo "\033[0;34mCloning Oh My Zsh...\033[0m" hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || { echo "git not installed" @@ -23,18 +37,27 @@ fi echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m" cp $ZSH/templates/zshrc.zsh-template ~/.zshrc -sed -i -e "/^export ZSH=/ c\\ +sed "/^export ZSH=/ c\\ export ZSH=$ZSH -" ~/.zshrc +" ~/.zshrc > ~/.zshrc-omztemp +mv -f ~/.zshrc-omztemp ~/.zshrc echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m" -sed -i -e "/export PATH=/ c\\ +sed "/export PATH=/ c\\ export PATH=\"$PATH\" -" ~/.zshrc +" ~/.zshrc > ~/.zshrc-omztemp +mv -f ~/.zshrc-omztemp ~/.zshrc -if [ "$SHELL" != "$(which zsh)" ]; then +# If this user's login shell is not already "zsh", attempt to switch. +if [ "$(expr "$SHELL" : '.*/\(.*\)')" != "zsh" ]; then + # If this platform provides a "chsh" command (not Cygwin), do it, man! + if hash chsh >/dev/null 2>&1; then echo "\033[0;34mTime to change your default shell to zsh!\033[0m" - chsh -s `which zsh` + chsh -s $(grep /zsh$ /etc/shells | tail -1) + # Else, suggest the user do so manually. + else + echo "\033[0;34mPlease manually change your default shell to zsh!\033[0m" + fi fi echo "\033[0;32m"' __ __ '"\033[0m" diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 5f0a81f1d..e06e4f331 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -9,7 +9,7 @@ then printf '\033[0;32m%s\033[0m\n' '\____/_/ /_/ /_/ /_/ /_/\__, / /___/____/_/ /_/ ' printf '\033[0;32m%s\033[0m\n' ' /____/ ' printf '\033[0;34m%s\033[0m\n' 'Hooray! Oh My Zsh has been updated and/or is at the current version.' - printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'http://twitter.com/ohmyzsh' + printf '\033[0;34m%s\033[1m%s\033[0m\n' 'To keep up on the latest news and updates, follow us on twitter: ' 'https://twitter.com/ohmyzsh' printf '\033[0;34m%s\033[1m%s\033[0m\n' 'Get your Oh My Zsh swag at: ' 'http://shop.planetargon.com/' else printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?' |