1
0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2024-11-22 14:15:18 +08:00
Commit Graph

53 Commits

Author SHA1 Message Date
Robby Russell
dd644a1fa9 Merge pull request #2743 from docwhat/issue-2155-scutil
Trust but verify 'scutil' to return ComputerName
2014-09-03 15:51:30 +02:00
Fredrik Fornwall
dac2a6e27a Replace /usr/bin/env with env
Some environments (such as Android) does not have /usr/bin.
2014-08-20 23:52:05 +02:00
Christian Höltje
00b21d5ac3 Trust but verify 'scutil' to return ComputerName
Apparently, it is possible to set up a Mac such that
`scutil --get ComputerName` hasn't been set.

This change checks if that fails and falls back to the original
mechanism.

Closes #2155
Closes #2183
2014-07-23 09:06:06 -04:00
Christian Höltje
67d74cbc2d Don't override ZSH_COMPDUMP if already set.
This allows customization via .zshenv if wanted. This is helpful
for zsh developers and people who want to move it out of $HOME
2014-06-07 10:13:21 +02:00
Juan Ignacio Donoso
dbdd23d0fa Prevents oh-my-zsh loading the .zshenv twice 2013-12-13 19:05:35 -03:00
Eddie Monge
8119234356 standardize logic blocks 2013-11-16 11:59:15 -08:00
Christian Höltje
d2fe03d754 Create the zcompdump based on version and host
This will prevent lots of subtle problems that happen when
people upgrade ZSH or use NFS mounted home directories.

The ZSH_COMPDUMP variable can also be used to implement `zcompile`
and other fun features in the future.
2013-05-17 11:17:33 -04:00
Robby Russell
e4891c5891 Merge pull request #1569 from ZeroKnight/master
Better custom theme loading
2013-04-23 20:47:29 -07:00
Robby Russell
b2421cc73f 005d967dc4 2013-04-07 19:26:40 -07:00
Alex
8a463b6df7 Better custom theme loading
oh-my-zsh.sh now also checks for $ZSH_CUSTOM/themes/$ZSH_THEME.zsh-theme when attempting to load a theme. This way custom themes can be a bit more organized in the 'custom' dir
2013-01-30 00:44:42 -05:00
Larry Lv
6c5e63022d Unset config_file variable in oh-my-zsh.sh
`config_file` variable will mess up with `cd` auto-complete command.

eg. I have a local dir named `Code`, and when I type `cd co<Tab>`,
config_file will show up, and doesn't make any sense...
2012-12-05 16:13:53 +08:00
Hok Shun Poon
263446d725 Expand for-loop so that it works under Snow Leopard Terminal.app. 2012-10-30 22:42:52 +00:00
natsumesou
61c39b5039 Load symlink custom files
`(.)` search only real files.
    The deletion of it enables searching symlink *.zsh files
2012-05-23 13:49:21 +09:00
Jim Myhrberg
f9018c5efb Load themes from $ZSH_CUSTOM instead of $ZSH/custom
This seems like a simple oversight, everything else uses `$ZSH_CUSTOM`
rather than `$ZSH/custom`.
2012-05-06 11:10:16 +01:00
Jim Myhrberg
51c55ad17e Suppress "zsh: no matches found" error when $ZSH_CUSTOM has no files
The addition of `(.N)` enables the `NULL_GLOB` option which suppresses
the error output in question.

Reference: http://www.zsh.org/mla/users/2004/msg00621.html
2012-05-06 11:08:34 +01:00
Arbo von Monkiewitsch
4b3429d765 fixing #812: adding plugins w/o plugin.zsh file to fpath. 2012-01-16 18:25:14 +01:00
Robby Russell
8bc60824f6 Merge pull request #618 from fceccon/custom-theme
Use a custom version of a theme if the user has it
2011-12-26 10:23:53 -08:00
Christian Höltje
258457ea4f Moved ZSH_CUSTOM declaration before fpath is set
* also normalized style to match the guide.
2011-11-16 09:46:05 -05:00
Christian Höltje
3512eca2ce set fpath correctly for custom plugins
Custom plugins weren't being added to the fpath correctly.
2011-11-16 09:27:34 -05:00
Robby Russell
0fe2462af8 Merge pull request #554 from toolbear/549-fix-auto-upgrade
Fix auto upgrade failure from non-exported ZSH env var
2011-10-10 05:40:38 -07:00
fceccon
2ca2ad3fc5 First search in the custom folder for the theme 2011-09-20 12:04:06 +02:00
Tim Taylor
c113e88c45 Fix auto upgrade failure from non-exported ZSH env var
Fixes #549. Specify ZSH=$ZSH explicitly when invoking
the auto update scripts.
2011-08-17 00:36:27 -04:00
Sune Kibsgaard Pedersen
3780247f63 added option of setting another path to custom plugins and files
just set ZSH_CUSTOM in your .zshrc, if not set oh-my-zsh.sh will
use the default custom dir in the repository
2011-08-04 12:37:33 +02:00
Marius Ghita
527355eae3 When the theme choice is left out, oh-my-zsh will not try to load it 2011-06-15 01:17:22 +03:00
Michael Komitee
9b4a89f327 Fix bug from Pull request #395
#395 broke oh-my-zsh for users who disable check-for-updates
2011-06-04 14:03:10 -04:00
vguerci
7c9474508c [upgrade] before init (no reload needed unless oh-my-zsh.sh has been modified) 2011-06-04 11:52:13 +02:00
Jake Bell
f8aae64e47 Adding ability to override plugins from the custom directory. 2011-05-26 12:34:37 -05:00
Robby Russell
f9e2af2bd7 Merge pull request #351 from GutenLinux/master
add custom completion support
2011-05-25 12:55:41 -07:00
Casey Watson
5c1b341132 Fix to random theme selection
- themes array is 1-based

 - theme files names are located in indicies 1 through N inclusive

 - this resolves an issue where you would occasionally see: "no such
   file or directory. Random theme '' loaded..."
2011-05-24 12:24:52 -06:00
Guten
1aacb74caf add custom completion support 2011-05-22 21:27:30 +08:00
Robby Russell
c8ac3356c8 Merge branch 'master' of github.com:robbyrussell/oh-my-zsh 2011-04-29 11:24:51 +02:00
Robby Russell
6f7d51c68d Feature: Random themes now supported. Just set your theme to 'random' and it'll load a different theme each time oh-my-zsh is started. Closes #309 2011-04-29 11:24:29 +02:00
Pat Regan
58a7cf19b7 Move sourcing of custom to below plugins 2011-04-28 19:12:05 -04:00
Pat Regan
796f5164f3 Minor reformatting 2011-04-12 19:53:55 -04:00
Pat Regan
757ebfcbd2 Moved the plugin fpath loop and compinit so they happen before custom scripts are loaded. 2011-04-12 17:50:15 -04:00
Pat Regan
6bf906a262 Optimize plugin loading so that only one call to compinit is required 2011-04-12 17:41:09 -04:00
Pat Regan
16ac094a43 Moved compinit call back to oh-my-zsh.sh, after plugins are loaded 2011-04-12 09:28:15 -04:00
Pat Regan
235733e5e2 Removed commented out code. 2011-04-08 11:12:21 -04:00
Pat Regan
ef4175981b Moved the single compinit call from oh-my-zsh.sh to lib/completion.zsh 2011-04-08 11:10:14 -04:00
Pat Regan
993e05da50 Replace redundant calls to compinit with a single call. 2011-04-08 10:12:22 -04:00
Michael Komitee
8294cf44d1 Postponing sourcing of the theme until after local customizations 2011-01-08 23:34:47 -05:00
Robby Russell
26d97a9355 Reorganizing plugins so that each plugin has it's own directory now so that any plugin-specific functions can be bundled within there. 2010-09-30 21:34:06 -07:00
Tomas Kramar
e37d62a282 unset config_file is useless 2010-09-26 18:28:29 +02:00
Robby Russell
3cf9ab722e Initial implementation of a new plugin system, so that people can managed which aliases/functions they want. 2010-06-03 12:03:26 -07:00
Robby Russell
7d036913c4 Unsetting config_file after loading config 2010-05-06 21:13:59 -07:00
johnmaxwelliv
20755df49e Based on a suggestion from robbyrussel, using env for greater compatibility. 2009-12-13 12:38:37 -07:00
johnmaxwelliv
59116a25f1 Instead of using the user's standard shell, this script should be run using zsh, since that was the shell it was written for. On my machine changes to my default shell only take effect when I log out and then long in again. Plus, it's nice for people to be able to try oh-my-zsh out even if zsh isn't their default shell right? :-) 2009-12-12 21:23:36 -07:00
Erik Kastner
b865f2ab38 adding homebrew completions - and a function dir 2009-10-26 00:47:23 -04:00
Jon Evans
eddab5034c run update check *after* running custom configuration scripts.
This means we are running it after $PATH has potentially been set up,
which means it's more likely that commands like "git" will be found
2009-10-01 08:55:07 +01:00
Robby Russell
107322c2e8 Moving some example files into custom/ 2009-09-23 08:02:58 -07:00