Skip to content

Commit

Permalink
Sdave/master (#1)
Browse files Browse the repository at this point in the history
* Added perms plugin (ohmyzsh#1752)

* Added perms plugin

* HTTPS -> HTTP for comment URL

* Added a README

* Updated TOF comment

* Pulled in updates by apjanke with minor tweaks

* Fix _tasks_changed algorithm in rake-fast plugin

* Fix syntax and formatting of rake-fast plugin

* Reword rake-fast README, add `lib/tasks` information

* rake-fast: change variable name from `$path' to `$file'

This solves a problem of using the variable name `$path' which then
smashes the environment variable `$PATH' and messes up the session.

See ohmyzsh#5343 (comment)

* Update the docker completion script with the official docker zsh
completion script

* Update README

* initial spotify control

* volume up/down added

* add info, share and status option

* add color echo

* change pause to play/pause

* add Search Option for album,artist and tracks

* add search option for playlist

* fix showStatus output

* complete help

* readme updated

* seach show Url of song

* Add Droplr plugin

* Add Droplr README

* droplr: convert ruby file into zsh

* Fixed typo (ohmyzsh#5369)

Coffee was missing an F

* Force ssh-agent output to use bourne-style syntax

On systems where the shell cannot be changed because of a strict
security policy, ssh-agent will use the syntax of whatever the
default $SHELL is.
For instance, if the default shell is tcsh, ssh-agent will use the
c-shell style (setenv).

This change forces ssh-agent to use bourne-style syntax since that
has to be later interpreted by zsh. Consequently, the environment
file will contain `export' statements from now on (instead of
`setenv').

* ssh-agent: Use /usr/bin/env to find ssh-add

This change is important when ssh-add is not inside /usr/bin e.g.
on NixOS.

Signed-off-by: Maximilian Güntner <code@maschinenpsychologe.de>

* Delete useless `/usr/bin/env` in ssh-agent

* Extract comments into README for ssh-agent plugin

* Clean up formatting of ssh-agent plugin

* Simplify PID check of current ssh-agent

* archlinux: yasu now working - only one dash needed (ohmyzsh#5373)

* ssh-agent: fix non-standard process check w/ pgrep

Confirmed to work on MacOS, OpenBSD, Solaris and busybox.

* git plugin: remove `format:' from --pretty flag

Changes gke, glol and glola aliases.

Fixes ohmyzsh#5362

* git: output nothing when no commits ahead or behind

This fixes old git_commits_ahead behavior and changes git_commits_behind
to have the same behavior.

Fixes ohmyzsh#5355

* Add ability to autocomplete services for brew-services.

* add firewalld aliases

* Fix git_prompt_status() not showing ahead/behind/diverged status correctly (ohmyzsh#5388)

* sudo firewall-cmd calls

* add readme

* corrected alias documentation

* npm: quiet error output of npm completion

* npm: only source npm completion cache if file exists

* npm: unset NPM_COMPLETION_FILE variable

* Add ctrl-r, ctrl-a and ctrl-e support in vi-mode (ohmyzsh#4994)

* Add ctrl-r support in vi-mode to perform backward search in history
* Add ctrl-a support to move to bol in vi-mode
* Add ctrl-e support to move to eol in vi-mode

Signed-off-by: Douglas Drumond <douglas@cafelinear.com>

* Add file completions for lein (ohmyzsh#5380)

* Fix iTerm crash on window re-size (ohmyzsh#5211)

* Readded docker-compose aliases (ohmyzsh#5412)

Removed by mistake in 0950f9c.

* Add -DskipITs and completion for -Dit.test mvn plugin (ohmyzsh#3641)

* Adds -DskipITs to auto completion list

* Adds integration test completion

* Fix battery plugin when acpi writes to stderr (ohmyzsh#5413)

* Fix battery plugin when acpi writes to stderr
* Make stderr redirection in battery plugin more idiomatic

* Improve gradle plugin task parsing (ohmyzsh#5230)

* Improve gradle plugin task parsing

Added _gradle and _gradlew as symbolic links to gradle.plugin.zsh,
otherwise the plugin was not properly loaded.

Output from `gradlew tasks --all` is now parsed in two levels,
first we find segments between `------...` and a newline.
Second, all those lines are parsed and cleaned using awk
and added to .gradletasknamecache.

Tested on gradle 2.13, and gradlew 2.14.

* Remove .gradletasknamecache before regenerating it

Remove the .gradletasknamecache file to avoid having an unnecessary
newline at the top of the file when regenerating it.

* Improve gradle task parsing by writing .gradletasknamecache atomically

Previously the .gradletasknamecache file was written line by line inside a parsing loop,
which could cause errors such as half-written cache files if the process was aborted.

This also removes the need of deleting the .gradletasknamecache file before parsing.

* Deprecating brew cask plugin (ohmyzsh#5191)

The good completion is now part of Homebrew so this one  will always be outdated.

See Homebrew/brew#407
and Homebrew/brew#936.

* Remove _brew zsh completion (ohmyzsh#5190)

Removing as this is now installed as part of homebrew automatically and this
version is out of date. See
https://github.com/Homebrew/brew/blob/master/share/zsh/site-functions/_brew

* ssh-agent: check ssh-agent process w/ ps again

The alternative is using tools that aren't available everywhere.
The latest report is that cygwin/msys2 doesn't have pgrep.

Fixes ohmyzsh#5418.

* Adding a link to Planet Argon who manages the site/project/shop

* Forgot a word in the footer

* Added 'gbd' alias for 'git branch -d' (ohmyzsh#5417)

* Add an alias for Rails console sandbox (ohmyzsh#5316)

The command ‘rails console —sandbox’ loads our Rails application,
connects to the database and automatically starts a database
transaction. All database operations performed within this console
session are rolled back upon leaving the console. Reference -
https://www.codeschool.com/blog/2014/06/17/rails-console-sandbox/

* Spotify Controller (ohmyzsh#5356)

* initial spotify control

* volume up/down added

* add info, share and status option

* add color echo

* change pause to play/pause

* add Search Option for album,artist and tracks

* add search option for playlist

* fix showStatus output

* complete help

* readme updated

* seach show Url of song

* Avoid unnecesary processing... (ohmyzsh#5352)

by discarding directories or files with permissions already correctly set

* missing listing and versions (ohmyzsh#5341)

versions is missing list is missing

*  Fix peepcode theme ruby prompt info (ohmyzsh#5339)

The ruby prompt info was not interpolating properly. Switching to use
 ruby_prompt_info helper. This addresses the issue.

* added support for bazaar in agnoster theme (ohmyzsh#5016)

the agnoster theme is now able to render basic information
if the user is currently residing inside a bazaar folder.
if so, it will render a green promt segment with "bzr" and
the current revision number in it. if there are untracked
files, the bar will be rendered in yellow. if there are
changes to already tracked files, a + character will be
printed.

* Update docker completion to match docker upstream (ohmyzsh#5060)

See https://github.com/docker/docker/blob/master/contrib/completion/zsh/_docker

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

* Update docker completion from upstream (ohmyzsh#5426)

https://github.com/docker/docker/blob/be9e3f59e625a7be05f21a23f6debfb3f6728573/contrib/completion/zsh/_docker

* Add check for git and bzr to agnoster theme

Plugin command-not-found on Arch Linux returns 0 if git or bzr is found in repos, hence outputting unwanted pkgfile output.
Checking if the commands exist first fixes all such issues.

* Adds option for directory to Xcode xc function. (ohmyzsh#5253)

* Added angular-cli (ng) completion.

* The argument completion also has no extra options.

* Updated options for generate.  Added gh-pages:deploy / github-pages:deploy.

* Added README.md

* Add some prompts for "install:install-file" (ohmyzsh#5376)

Add "-DgroupId= -DartifactId= -Dversion= -Dpackaging=jar -Dfile=" to options for
"install:install-file" for when you need install a local jar file.

Closes ohmyzsh#5376.

* Fix hyphen and underscore filename completion

This deletes the previous hack that allowed completing files with
the extension: e.g. `abcd.z` to `abcdefg.z`.

It is still possible to use `abcd[TAB].z`, and hyphens or underscores
are very much more important than this other trick.

Source:
ohmyzsh#1398 (comment)

Signed-off-by: Marc Cornellà <marc.cornella@live.com>

* Fix styling of lib/completion.zsh

* Add copybuffer function and keybinding (ohmyzsh#5431)

* Add copybuffer function and keybinding:

binds ctrl-o to copy the command line buffer to the system clipboard.

* Add README

* README copy updates

* Add a tip to ease agnoster first setup

* globalias fix ohmyzsh#4834

* Add more docker compose aliases (ohmyzsh#5422)

Adds the following aliases:

```zsh
alias dco='docker-compose'
alias dcr='docker-compose run'
alias dce='docker-compose exec'
```

And sorts the aliases similar to `docker-compose help` order

* Update pip plugin to last stable release (ohmyzsh#5472)

Update pip plugin to last stable release

* Add README to svn plugin

* Add localization workaround to svn plugin

* Clean up svn README

* Clean up and refactor code in svn plugin

* extract: fix styling

* extract: fix extraction of deb packages with data.tar.xz

* extract: replace basename&sed w/ zsh variable expansion syntax

`${var:t:h}` uses:

- `${var:t}` which acts as `basename`.

- `${var:r}` which removes the extension.

See http://zsh.sourceforge.net/Doc/Release/Expansion.html#Modifiers

* extract: add file extensions to extract completion

* extract: add README

* git.plugin.zsh: Don't run Git hooks when making a WIP commit (ohmyzsh#4751)

When making a WIP commit, we generally just want to save the state of the
current branch temporarily, maybe because we want to push our work for backup
purposes, or change branch to work on something else. Therefore, it's generally
undesirable to run Git hooks, which might do things like run linters, because
we probably don't care if our WIP has lint errors.

* Add missing newline to end of `spotify status` output (ohmyzsh#5480)

* last-working-dir: clean up source

* last-working-dir: add README

* last-working-dir: don't jump if not in $HOME

* Change confusing 12h-time without AM/PM to system-localized time

* Add /usr/local/bin to autoenv search path (ohmyzsh#5481)

The current list of directories to search for autoenv on misses the default location on Ubuntu systems if you just do a normal `pip install autoenv` - [it will place](https://github.com/kennethreitz/autoenv/blob/master/setup.py#L16) `activate.sh` in `/usr/local/bin` unless you manually override the `--prefix` or something.

The `/usr/local/opt/autoenv` is fine for macOS/homebrew installations but it would be nice not to have to manually patch on Linux :)

* Add aliases for docker-compose logs (ohmyzsh#5475)

* Added pacaur aliases

This commit removes most of its contents: it just leaves the
contribution signature. The rest is obsolete and superseeded
by ohmyzsh#5460, but the contribution is still valuable.

Related: ohmyzsh#4263.

Signed-off-by: Marc Cornellà <marc.cornella@live.com>

* Add pacaur compatibility to archlinux plugin + refactor

* Updated README of the archlinux plugin

* Fix small copy-editing mistake in archlinux README

* Add alias for signed git commit with message (ohmyzsh#5390)

Signed-off-by: Mat Munn <mat@savi.com.au>

* Implement a locking mechanism to avoid multiple update prompts (fixes ohmyzsh#3766)

* Use rmdir instead of rm -r

* Convert "if then" statements to "if; then" one-liners

* Added simple support for Cargo -
the Rust build system

* Revert "Change confusing 12h-time without AM/PM to system-localized time"

This reverts commit 06d52a6.

* Change confusing 12h without AM/PM to a clean 24h display.
It was not possible to simply add AM/PM since strftime return blank for %p %P

* feat(plugin): add nomad

* feat(nomad): add common commands and new readme

* Add completion for cargo, the rust build tool

Copy of the official repository:
https://github.com/rust-lang/cargo/tree/master/src/etc

Signed-off-by: Marc Cornellà <marc.cornella@live.com>

* Add README for the cargo plugin

* Add an alias for React Native Link command (ohmyzsh#5491)

* Add jgitflow maven goals (ohmyzsh#5489)

* Fix cp plugin completion and refactor (ohmyzsh#5427)

* cp plugin: change cpv to function so that completion works

* cp plugin: show numbers in units of 1024 (K,M,G,T)

Use `-h` level (3): output numbers in units of 1024.
See the manpage of rsync for more information.

* cp plugin: add a README file

* cp plugin: recurse directories

* cp plugin: remove `--` to separate files from options

This has some undesired effects, like having `cpv --help` be a file
not found error.

Use `--` yourself if you need it (which you generally don't):

```zsh
cpv -- -some-file-with-hyphens.txt /tmp
```

Added this same info to the README.

* set better default colors for GNU ls instead of none.

GNU coreutils ship a color setup command by default which can be used to
set a good default color theme for ls:

  https://www.gnu.org/software/coreutils/manual/html_node/dircolors-invocation.html

* Use `$commands[]` to check for command existence

* Only set default LS_COLORS if not set before

Also, force the use of Bourne-style shell syntax with `dircolors -b`.

* Fix style of theme-and-appearance.zsh

* specify globalias modes

* README for globalias

* fix comment

* Fix formatting and usage section

Also:

- Changes `globes` (which doesn't exist) to `glob expressions`.

- Delete the `trigger autocompletion to your current aliases` use case, since that's not
  really implemented.

* Update per-directory-history plugin to latest version (ohmyzsh#5493)

Latest version: February 17, 2016 - dd81201

* Fix compdef commands in git plugin

The command `compdef command=git` returns an error in some cases, the
appropriate command is `compdef _git command`.

Fixes ohmyzsh#5442

* Add non 0 exit code for missing jump targets (ohmyzsh#5500)

This allows for the user to combine the jump command with something else. In my example cd and jump are now combined like this:

```bash
jumpcd() {
        jump $1 > /dev/null || cd $1
}
alias cd="jumpcd"
```

* Add m4a format in the common aliases plugin (ohmyzsh#5502)

The m4a file format can be opened in the command line with mplayer

* remove duplicate alias (ohmyzsh#5508)

Removing one "apt-get autoremove" alias because it is duplicated.

* Take advantage of LS_COLORS for the color of completion if GNU ls is used. (ohmyzsh#5510)

* Use OSTYPE instead of uname whenever possible for better speed. (ohmyzsh#5496)

* Use $+commands to check the existence of a command in clipboard.zsh. (ohmyzsh#5519)

* Fix ls colouring for Darwin. (ohmyzsh#5516)

* Fix ls coloring in MacOS if gls is not installed

Fixes ohmyzsh#5520.

* readme change OS X to macOS

Change OS X to macOS in the read me file in line with apples rebranding
of the operating system.

* Display suvash prompt w/o Ruby; refactor code

* Update bira theme (ohmyzsh#4954)

* Add '#' instead of '$' when in root
* Make return code bold

* Fix regex for optional http(s), and variable reference inside osascript.

* Update README with grammar corrections (ohmyzsh#5503)

* Change from OSX to macOS in README (ohmyzsh#5545)

* Update docker completion (2015-10-25)

Closes ohmyzsh#5568

Source:
moby/moby@c9fdf9a

* Change link to agnoster wiki + format changes

https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster

* add docker-compose down alias (ohmyzsh#5557)

* add docker-compose down alias

* rename `docker-compose down` alias to `dcdn`

* Add more simulator aliases (ohmyzsh#5550)

* Add brew completion missing disclaimer

* Clarify how to open ~/.zshrc file in README.md

Closes ohmyzsh#5558

* PHP suffix alias should be removed

PHP can be executed as CLI script but due to the automated attempt
to add browser support to that extension such ability is prevented
in certain circumstances.

* common-aliases: check if $BROWSER is defined on browser aliases

* common-aliases: minor style fixes

* common-aliases: check if `$XIVIEWER` is defined and minor fixes

* znt: Update to v2.2.7 (ohmyzsh#5576)

* Check dircolors settings before using gls on darwin (ohmyzsh#5570)

`gls` seems to be installed by default or on most macOS systems, but its
default color scheme sucks. This fix will make sure to only use it if it
has been customised prior to running OMZ.

Related: ohmyzsh#5516, ohmyzsh#5520.

* Fix invalid "ls -G" alias.

* node: open module-specific node documentation (ohmyzsh#5572)

* Changed dsa --> rsa in zshrc.zsh-template file (ohmyzsh#5603)

* Fix ohmyzsh#5604: No DIR ( directory ) colors (ohmyzsh#5605)

* dircycle: fix error on insert-cycledleft if dirstack is empty

* Update endpoint from HTTP to HTTPS (ohmyzsh#5622)

* brew: fix disclaimer shown if mkdir is aliased

Fixes ohmyzsh#5623.

* fix(env): Do not override misc env set before sourcing oh-my-zsh (ohmyzsh#5231)

Sourcing oh-my-zsh happens in zshrc, which will override settings of
profile and zshenv.  Treat misc values, `PAGER` and `LESS`, as default
settings without overriding existing values.

Fixes: #1, ohmyzsh#3016

* feat: no CI on WIP commits (ohmyzsh#5643)

* Yarn (https://yarnpkg.com) completion support (ohmyzsh#5542)

* yarn completion

* Add plugin for Swift Package Manager (ohmyzsh#5670)

* Add plugin for Swift Package Manager
* swift-package-manager: Rename plugin to 'swift-pm'

* swift-pm: Rename plugin to 'swiftpm' (ohmyzsh#5674)

* Precise Unix-based wording 

Closes ohmyzsh#5681

* Fix (plugins debian and ubuntu): `apt-history list` using `zgrep` (ohmyzsh#5695)

Changing from `zcat` to `zgrep` because some `zcat` implementations do not work
if the file is not compressed.

* gradle: extract simple task names from subproject tasks (ohmyzsh#5704)

Currently, only tasks with complete subproject specifier are added to
.gradletasknamecache. Gradle commands can be called for all (sub-)projects
they are defined for, using their name as defined in the subproject, here
called "simple" task names. One example is "gradle clean".

This patch adds support for parsing out those "simple" task names from the list
of fully specified task names. The .gradletasknamecache file will contain
both the fully specified names, and the "simple" names for your autocompletion
pleasure.

* add dotenv plugin (ohmyzsh#4373)

* docker: update completion (upstream 2fe62f2)

Closes ohmyzsh#5683

* Add git alias for staging tracked files (ohmyzsh#5178)

Although `gaa` (git add --all) is cool, it stages every file, tracked or
not, if it is not on .gitignore.

Sometimes we want to just stage everything we are working on, that is
already tracked. For that reason, 'gau' can save us some time.

* Add file completion to `mix run` (ohmyzsh#5673)

* Add a React Native alias, and one to start the web server (ohmyzsh#5711)

* Add a React Native alias, and one to start the web server

* Reorganise aliases in react-native plugin

* Update README for react-native plugin:

  Fix format and add a brief description
  Add missing aliases in react-native plugin README

* Add heroku `features` command to completion (ohmyzsh#5667)

* Update react-native autocomplete arguments (ohmyzsh#5646)

* Add mvn asciidoctor commands (ohmyzsh#5645)

* Add mvn asciidoctor commands
* Fix formatting in mvn plugin

* Add more information to cask plugin README

*  'lib/completion.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'lib/functions.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/droplr/README.md: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/gnu-utils/gnu-utils.plugin.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/history-substring-search/history-substring-search.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/scala/_scala: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/suse/suse.plugin.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/terraform/_terraform: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/ubuntu/readme.md: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/ubuntu/ubuntu.plugin.zsh: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/z/README: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'plugins/z/z.1: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'themes/half-life.zsh-theme: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'themes/pure.zsh-theme: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'themes/steeef.zsh-theme: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

*  'themes/trapd00r.zsh-theme: Solve typos'

Signed-off-by: Patrick José Pereira <patrickelectric@gmail.com>

* Improve UX for Spotify quit command in osx plugin (ohmyzsh#5726)

* Improve UX for Spotify commands in osx plugin

Spotify command UX is a bit weak for people who live and work almost entirely in shells.
- `spotify quit` should not open Spotify if it is not already running. Should confirm that Spotify is indeed not running.
- `spotify quit` should not blow away the user's shell once Spotify is quit. This can be a disruption to work flow.

This PR looks to add a few little checks which will help improve this experience.
This PR also adds a space to line 477 between `break` and `;;` for consistency. Doesn't seem like a big enough change to put in its own PR.

* Rearranging output as per peer feedback

* osx plugin's spotify: change quitting w/ closing

Closing is more idiomatic English.

* chore: update license years (ohmyzsh#5737)

* Improved gradle options (arguments) completion (ohmyzsh#5743)

* Sort gradle options for autocompletion

This will allow us to more easily keep the options list up-to-date

* Add missing gradle options to gradle plugin

Reflect documentation at
https://docs.gradle.org/3.2.1/userguide/gradle_command_line.html

* Adding new path to look for activate.sh (ohmyzsh#5654)

If autoenv was installed with pip and modifier --user, activate.sh will be at .local/bin

* Change af-magic theme's branch color (ohmyzsh#5730)

* Add goodreads search provider (ohmyzsh#5778)

* add missing new line escape (ohmyzsh#5896)

missing \ was causing command not found errors when tab completing docker build -t <tab>

* Update composer.plugin.zsh (ohmyzsh#5889)

Adds remove/global remove and optimize-autoloader commands.

* Fixing battery prompt formatting issue (cf ohmyzsh#5894) (ohmyzsh#5895)

Signed-off-by: Guyzmo <guyzmo+github+pub@m0g.net>

* Use proper config bin directory (ohmyzsh#5886)

Add the proper config bin directory to `PATH` instead of the previously (incorrect) fixed `~/.composer/vendor/bin`. Nowadays the right config dir is `~/.config/composer/vendor/bin`.

* Added pacman file aliases (ohmyzsh#5869)

* itunes playlist first commit (ohmyzsh#5860)

Added playlist feature for the itunes command: 
if a variable is passed and is valid - will play the playlist
if a variable is passed and is invalid(no such playlist) - will stop all playing
if no variable is passed will print all playlists available on the host

* Updating README intro

* Add CONTRIBUTING.md file general structure

* rewrite of contribution guidelines

* Contributing: simple english, formatting

* contributing: mention testing

* Rename pure theme to 'refined'

* Add CONTRIBUTING.md file general structure

* rewrite of contribution guidelines

* Contributing: simple english, formatting

* contributing: mention testing

* contributing: "correct" -> "expected" behavior
see
ohmyzsh#3770 (comment)

* contributing: improve PR section

* contributing: "eg" -> "e.g." because oxford
see http://www.oxforddictionaries.com/definition/english/e.g.

* Remove wrong whitespace in bira theme (ohmyzsh#5985)

The whitespace in line 13 creates a double whitespace when combined with line 24. Therefore 2 whitespaces appear between ${user_host} and ${current_dir}.

* Add deprecation notice to pure theme

* Fix host display in nebirhos theme

Fixes ohmyzsh#6028

* Fix RKJ theme coloring and make it slightly more readable (ohmyzsh#5582)

* Adding `glogd` to preetty print git graph with dates.
  • Loading branch information
sdave2 authored May 11, 2017
1 parent 5dbb460 commit e2d34dc
Show file tree
Hide file tree
Showing 278 changed files with 13,573 additions and 2,887 deletions.
11 changes: 5 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
locals.zsh
log/.zsh_history
projects.zsh
custom
# custom files
custom/
!custom/plugins/example
!custom/example.zsh
*.swp
!custom/example.zshcache

# temp files directories
cache/
log/
123 changes: 123 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
# CONTRIBUTING GUIDELINES

Oh-My-Zsh is a community-driven project. Contribution is welcome, encouraged and appreciated.
It is also essential for the development of the project.

These guidelines are an attempt at better addressing the huge amount of pending
issues and pull requests. Please read them closely.

Foremost, be so kind as to [search](#use-the-search-luke). This ensures any contribution
you would make is not already covered.

* [Issues](#reporting-issues)
* [You have a problem](#you-have-a-problem)
* [You have a suggestion](#you-have-a-suggestion)
* [Pull Requests](#submitting-pull-requests)
* [Getting started](#getting-started)
* [You have a solution](#you-have-a-solution)
* [You have an addition](#you-have-an-addition)
* [Information sources (_aka_ search)](#use-the-search-luke)

**BONUS:** [Volunteering](#you-have-spare-time-to-volunteer)

## Reporting Issues

### You have a problem

Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
your problem.

If you find one, comment on it so we can know there are more people experiencing it.

If not, look at the [Troubleshooting](https://github.com/robbyrussell/oh-my-zsh/wiki/Troubleshooting)
page for instructions on how to gather data to better debug your problem.

Then, you can go ahead and create an issue with as much detail as you can provide.
It should include the data gathered as indicated above, along with:

1. How to reproduce the problem
2. What the correct behavior should be
3. What the actual behavior is

Please copy to anyone relevant (_eg_ plugin maintainers) by mentioning their GitHub handle
(starting with `@`) in your message.

We will do our very best to help you.

### You have a suggestion

Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
your suggestion.

If you find one, comment on it so we can know there are more people supporting it.

If not, you can go ahead and create an issue. Please copy to anyone relevant (_eg_ plugin
maintainers) by mentioning their GitHub handle (starting with `@`) in your message.

## Submitting Pull Requests

### Getting started

You should be familiar with the basics of
[contributing on GitHub](https://help.github.com/articles/using-pull-requests) and have a fork
[properly set up](https://github.com/robbyrussell/oh-my-zsh/wiki/Contribution-Technical-Practices).

You MUST always create PRs with _a dedicated branch_ based on the latest upstream tree.

If you create your own PR, please make sure you do it right. Also be so kind as to reference
any issue that would be solved in the PR description body,
[for instance](https://help.github.com/articles/closing-issues-via-commit-messages/)
_"Fixes #XXXX"_ for issue number XXXX.

### You have a solution

Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering your solution.

If the solution is already reported, try it out and +1 the pull request if the
solution works ok. On the other hand, if you think your solution is better, post
it with a reference to the other one so we can have both solutions to compare.

If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
maintainers) by mentioning their GitHub handle (starting with `@`) in your message.

### You have an addition

Please [do not](https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#dont-send-us-your-theme-for-now)
send themes for now.

Please be so kind as to [search](#use-the-search-luke) for any pending, merged or rejected Pull Requests
covering or related to what you want to add.

If you find one, try it out and work with the author on a common solution.

If not, then go ahead and submit a PR. Please copy to anyone relevant (_eg_ plugin
maintainers) by mentioning their GitHub handle (starting with `@`) in your message.

For any extensive change, _eg_ a new plugin, you will have to find testers to +1 your PR.

----

## Use the Search, Luke

_May the Force (of past experiences) be with you_

GitHub offers [many search features](https://help.github.com/articles/searching-github/)
to help you check whether a similar contribution to yours already exists. Please search
before making any contribution, it avoids duplicates and eases maintenance. Trust me,
that works 90% of the time.

You can also take a look at the [FAQ](https://github.com/robbyrussell/oh-my-zsh/wiki/FAQ)
to be sure your contribution has not already come up.

If all fails, your thing has probably not been reported yet, so you can go ahead
and [create an issue](#reporting-issues) or [submit a PR](#submitting-pull-requests).

----

### You have spare time to volunteer

Very nice!! :)

Please have a look at the [Volunteer](https://github.com/robbyrussell/oh-my-zsh/wiki/Volunteers)
page for instructions on where to start and more.
13 changes: 7 additions & 6 deletions MIT-LICENSE.txt → LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
The MIT License
The MIT License (MIT)

Copyright (c) 2009-2015 Robby Russell and contributors (see https://github.com/robbyrussell/oh-my-zsh/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
of this software and associated documentation files (the "Software"), to deal
Expand All @@ -9,13 +10,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
57 changes: 39 additions & 18 deletions README.markdown → README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,27 @@
![Oh My Zsh](https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png)
<p align="center">
<img src="https://s3.amazonaws.com/ohmyzsh/oh-my-zsh-logo.png" alt="Oh My Zsh">
</p>

Oh My Zsh is an open source, community-driven framework for managing your [zsh](http://www.zsh.org/) configuration.

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.
Sounds boring. Let's try 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 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.
__Oh My Zsh will not make you a 10x developer...but you might feel like one.__

To learn more, visit http://ohmyz.sh and/or follow [ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.
Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_

## Getting Started
Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often.

To learn more, visit [ohmyz.sh](http://ohmyz.sh) and follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter.

## Getting Started

### Prerequisites

__Disclaimer:__ _Oh My Zsh works best on Mac OS X and Linux._
__Disclaimer:__ _Oh My Zsh works best on macOS 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). 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)
* Unix-like operating system (macOS or Linux)
* [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

Expand All @@ -25,11 +31,15 @@ Oh My Zsh is installed by running one of the following commands in your terminal

#### via curl

`sh -c "$(curl -fsSL https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"`
```shell
sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
```

#### via wget

`sh -c "$(wget https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"`
```shell
sh -c "$(wget https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh -O -)"
```

## Using Oh My Zsh

Expand All @@ -39,9 +49,9 @@ Oh My Zsh comes with a shit load of plugins to take advantage of. You can take a

#### Enabling Plugins

If you spot a plugin (or several) that you would like to use with Oh My Zsh, you will need to edit the `~/.zshrc` file. Once you open it with your favorite editor, you'll see a spot to list all the plugins that you'd like Oh My Zsh to load in initialization.
Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.

For example, this line might begin to look like...
For example, this line might begin to look like this:

```shell
plugins=(git bundler osx rake ruby)
Expand All @@ -57,7 +67,7 @@ We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme

#### Selecting a Theme

_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just right (for him)._
_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._

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:

Expand All @@ -69,9 +79,11 @@ To use a different theme, simply change the value to match the name of your desi

```shell
ZSH_THEME="agnoster" # (this is one of the fancy ones)
# you might need to install a special Powerline font on your console's host for this to work
# see https://github.com/robbyrussell/oh-my-zsh/wiki/Themes#agnoster
```

Open up a new terminal window and your prompt should look something like...
Open up a new terminal window and your prompt should look something like this:

![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)

Expand Down Expand Up @@ -100,7 +112,7 @@ 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:

```shell
curl -L https://raw.github.com/robbyrussell/oh-my-zsh/master/tools/install.sh | ZSH=~/.dotfiles/zsh sh
export ZSH="$HOME/.dotfiles/oh-my-zsh"; sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
```

#### Manual Installation
Expand All @@ -119,7 +131,7 @@ 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.
You can create a new zsh config file by copying the template that we have included for you.

```shell
cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
Expand Down Expand Up @@ -198,12 +210,21 @@ Thank you so much!

## Follow Us

We have an [@ohmyzsh](https://twitter.com/ohmyzsh) Twitter account. You should follow it.
We're on the social media.

* [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
* [Oh My Zsh](https://www.facebook.com/Oh-My-Zsh-296616263819290/) on Facebook.

## 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

Oh My Zsh is released under the [MIT license](https://github.com/robbyrussell/oh-my-zsh/blob/master/MIT-LICENSE.txt).
Oh My Zsh is released under the [MIT license](LICENSE.txt).

## About Planet Argon

![Planet Argon](http://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg)

Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github).
4 changes: 0 additions & 4 deletions cache/.easter-egg

This file was deleted.

Empty file added cache/.gitkeep
Empty file.
13 changes: 9 additions & 4 deletions custom/example.zsh
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Add yourself some shortcuts to projects you often work on
# Example:
# You can put files here to add functionality separated per file, which
# will be ignored by git.
# Files on the custom/ directory will be automatically loaded by the init
# script, in alphabetical order.

# For example: add yourself some shortcuts to projects you often work on.
#
# brainstormr=~/Projects/development/planetargon/brainstormr
# cd $brainstormr
#
# brainstormr=/Users/robbyrussell/Projects/development/planetargon/brainstormr
#
Loading

0 comments on commit e2d34dc

Please sign in to comment.