Merge branch 'master' of github.com:robbyrussell/oh-my-zsh

LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2016 Robby Russell and contributors
+Copyright (c) 2009-2017 Robby Russell and contributors
 See the full list at https://github.com/robbyrussell/oh-my-zsh/contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy

lib/completion.zsh

@@ -5,7 +5,7 @@ WORDCHARS=''
 
 unsetopt menu_complete   # do not autoselect the first completion entry
 unsetopt flowcontrol
-setopt auto_menu         # show completion menu on succesive tab press
+setopt auto_menu         # show completion menu on successive tab press
 setopt complete_in_word
 setopt always_to_end
 

lib/functions.zsh

@@ -86,7 +86,7 @@ function default() {
 }
 
 #
-# Set enviroment variable "$1" to default value "$2" if "$1" is not yet defined.
+# Set environment variable "$1" to default value "$2" if "$1" is not yet defined.
 #
 # Arguments:
 #    1. name - The env variable to set

plugins/archlinux/README.md

@@ -73,6 +73,8 @@
 | pacupd       | sudo pacman -Sy                         | Update and refresh the local package database                |
 | pacupg       | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
 | upgrade      | sudo pacman -Syu                        | Sync with repositories before upgrading packages             |
+| pacfileupg   | sudo pacman -Fy                         | Download fresh package databases from the server             |
+| pacfiles     | pacman -Fs                              | Search package file names for matching strings.              |
 
 | Function       | Description                                          |
 |----------------|------------------------------------------------------|

plugins/archlinux/archlinux.plugin.zsh

@@ -82,6 +82,8 @@ alias pacinsd='sudo pacman -S --asdeps'
 alias pacmir='sudo pacman -Syy'
 alias paclsorphans='sudo pacman -Qdt'
 alias pacrmorphans='sudo pacman -Rs $(pacman -Qtdq)'
+alias pacfileupg='sudo pacman -Fy'
+alias pacfiles='pacman tFs'
 
 
 if (( $+commands[abs] && $+commands[aur] )); then

plugins/autoenv/autoenv.plugin.zsh

@@ -1,7 +1,7 @@
 # Activates autoenv or reports its failure
 () {
 if ! type autoenv_init >/dev/null; then
-  for d (~/.autoenv /usr/local/opt/autoenv /usr/local/bin); do
+  for d (~/.autoenv ~/.local/bin /usr/local/opt/autoenv /usr/local/bin); do
     if [[ -e $d/activate.sh ]]; then
       autoenv_dir=$d
       break

plugins/battery/battery.plugin.zsh

@@ -100,7 +100,7 @@ elif [[ "$OSTYPE" = linux*  ]] ; then
       else
         color='red'
       fi
-      echo "%{$fg[$color]%}[$(battery_pct_remaining)%%]%{$reset_color%}"
+      echo "%{$fg[$color]%}$(battery_pct_remaining)%%%{$reset_color%}"
     else
       echo "∞"
     fi

plugins/cask/README.md

@@ -1,11 +1,15 @@
-# cask plugin
+# Cask plugin
 
-Loads `cask` completion from non-standard locations, such as if installed
+[Cask](https://github.com/cask/cask) is a project management tool for Emacs that helps
+automate the package development cycle; development, dependencies, testing, building,
+packaging and more.
+
+This plugin loads `cask` completion from non-standard locations, such as if installed
 via Homebrew or others. To enable it, add `cask` to your plugins array:
 
 ```zsh
 plugins=(... cask)
 ```
 
-Make sure you have the `cask` directory in your `$PATH` before loading
-Oh My Zsh, otherwise you'll get the "command not found" error.
+Make sure you have the `cask` directory in your `$PATH` before loading Oh My Zsh,
+otherwise you'll get a "command not found" error.

plugins/composer/composer.plugin.zsh

@@ -39,14 +39,17 @@ alias c='composer'
 alias csu='composer self-update'
 alias cu='composer update'
 alias cr='composer require'
+alias crm='composer remove'
 alias ci='composer install'
 alias ccp='composer create-project'
 alias cdu='composer dump-autoload'
+alias cdo='composer dump-autoload --optimize-autoloader'
 alias cgu='composer global update'
 alias cgr='composer global require'
+alias cgrm='composer global remove'
 
 # install composer in the current directory
 alias cget='curl -s https://getcomposer.org/installer | php'
 
 # Add Composer's global binaries to PATH
-export PATH=$PATH:~/.composer/vendor/bin
+export PATH=$PATH:$(composer global config bin-dir --absolute) 2>/dev/null