psi-jack/zimfw
1
0
Fork 0
mirror of synced 2024-11-27 09:45:34 -05:00
Code Issues Releases Wiki Activity
402 commits 4 branches 35 tags 2.1 MiB
Commit graph

325 commits

Author SHA1 Message Date
Eric Nielsen
695d46284c [meta] use uname -a to prevent OS conflicts 
Fix `uname` calls with `-o` parameter, as this is not BSD compatible.
As per @Eriner, use `uname -a` instead as a "catch-all" parameter.

Fixes #75, Closes #79
 2016-09-28 03:02:10 -07:00
Matt Hamilton
d2458b1a8f [syntax-highlighting] update submodule 2016-09-27 16:40:16 -07:00
Matt Hamilton
e209799a5c [prompt] pure: update submodule 2016-09-27 16:40:00 -07:00
Matt Hamilton
b5134b8ab2 [prompt] liquidprompt: update submodule 2016-09-27 16:39:35 -07:00
Matt Hamilton
ccd441b197 [completion] update submodule 2016-09-27 16:39:21 -07:00
Eric Nielsen
f812c1bb6a [debug] Refactor debug module 
Use `$PS4` debugging prompt to generate timestamps, instead of GNU `date`.
This also keeps timestamps and respective command together, something
that `paste` could not guarantee given some commands may have multiple lines.

The prompt timestamp has a precision of 6 decimals. The `printf "%12.9f\n"`
instruction with 9 decimals was kept to keep producing "the **SAME** output".
This could be replaced to `printf "%12.6f\n"` to make the output
smaller.
Also, only the first line of commands with multiple lines are saved, to
keep the output format backwards-compatible.

Closes #84
 2016-09-27 15:59:02 -07:00
Eric Nielsen
40ef228286 [prompt] magicmace: fix tab completion 
The offender was `print -P`, where `-P` does [prompt
expansion](http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html#Prompt-Expansion).

I took the freedom to also change a few things:
Move the `add-zsh-hook precmd` up,
add `prompt_magicmace_` prefix to all function names,
add `COLOR_` prefix to all color global variables,
and move assignment to `PROMPT` to `prompt_magicmace_setup`.

Fixes #70, Closes #81
 2016-09-27 15:58:45 -07:00
Matt Hamilton
d551b90050 [meta] add zim_debug tool 
Closes #51
 2016-09-06 13:05:17 -07:00
Matt Hamilton
d55939e528 [meta] add zim_issue template builder 2016-09-05 16:34:27 -07:00
Matt Hamilton
a9c8269291 [prompt] pure: update submodule 2016-09-04 08:46:06 -07:00
Matt Hamilton
0fa860ef84 [completion] update submodule 2016-09-04 08:45:54 -07:00
Matt Hamilton
e2ef8f1bb5 [syntax-highlighting] update submodule 2016-09-04 08:45:32 -07:00
Matt Hamilton
f7d3cdf812 [meta] add module and fixup tools 2016-09-02 18:28:29 -07:00
Matt Hamilton
fc45c8e328 [syntax-highlighting] update submodule 2016-08-30 09:29:30 -07:00
Matt Hamilton
882441c625 [syntax-highlighting] update submodule 2016-08-21 11:38:02 -07:00
Juraj Fiala
a1341265b9 [input] Add PageUp/Down to navigate history 
Incredibly useful when combined history-substring-search and/or a laptop keyboard.

Closes #72
 2016-08-15 23:14:54 -07:00
Matt Hamilton
e49fdbd260 [syntax-highlighting] update submodule 2016-08-15 20:32:44 -07:00
Fernando Barillas
1b44eb6404 [prompt] Add lean prompt: github.com/miekg/lean 
Closes #71
 2016-08-15 20:31:17 -07:00
Matt Hamilton
bb81ab09b9 [syntax-highlighting] update submodule 2016-08-11 18:14:11 -07:00
Matt Hamilton
8ff67e0987 [completion] update submodule 2016-08-11 18:13:53 -07:00
Matt Hamilton
8ac887e8e9 [prompt] pure: update submodule 2016-07-27 19:41:05 -07:00
Tmplt
0a33a3de90 [prompt] magicmace: add theme 
Closes #69
 2016-07-27 19:36:43 -07:00
Matt Hamilton
5556897150 [syntax-highlighting] update submodule 2016-07-26 13:51:04 -07:00
Matt Hamilton
474b7e1add [prompt] pure: update submodule 2016-07-26 13:50:52 -07:00
Matt Hamilton
1af72f41a2 [prompt] liquidprompt: update submodule 2016-07-26 13:50:34 -07:00
Matt Hamilton
8721d39484 [completion] update submodule 2016-07-26 13:50:07 -07:00
nshtg
3a37a3f0e1 [prompt] steeef: always update git information 
steeef would not update the git information if we stayed in the same directory.

Fixes #66. Closes #67.
 2016-07-26 13:48:39 -07:00
Amin Bandali
6b2dad4bd1 [prompt] steeef: '#' prompt for privileged users 
Use `%(!.#.$)` which will display `$` for normal users and `#` for privileged users

Closes #65
 2016-07-26 13:36:12 -07:00
Tmplt
5f7a75a969 [prompt] add ranger indicator to eriner theme 
closes #64
 2016-07-17 08:18:49 -07:00
Matt Hamilton
074677207c [substring-search] update submodule 2016-07-16 17:20:14 -07:00
Matt Hamilton
d904e94ae7 [syntax-highlighting] update submodule 2016-07-16 17:19:33 -07:00
Laurentiu Nicola
8a4413f2ec [input] Fix parse error old zsh versions 
Closes #61, closes #62.
 2016-06-22 16:09:03 -07:00
Matt Hamilton
494e44375c [environment] fix better bracketed paste 
Fixes #60
 2016-06-22 16:07:46 -07:00
Matt Hamilton
345233741e [environment] better bracketed paste zsh >=5.2 2016-06-15 18:46:54 -07:00
Matt Hamilton
a849172fbb [syntax-highlighting] update submodule 2016-06-10 19:50:55 -07:00
Matt Hamilton
746ac0519c [syntax-highlighting] update submodule 2016-06-03 21:27:23 -07:00
Matt Hamilton
926b47a65d [prompt] update "liquidprompt" theme submodule 2016-06-03 21:27:11 -07:00
Matt Hamilton
e4378dd8b2 [completion] update submodule 2016-06-03 21:26:48 -07:00
Matt Hamilton
7439df5836 [input] add double-dot expansion option 
Closes #49
 2016-05-20 20:25:04 -07:00
Alex Poslavsky
41154cd0c4 [utility] fix OpenBSD grep color 
Use ggrep or use no color, also fixes #54.

Closes #54, closes #55
 2016-05-20 18:43:20 -07:00
Igor Zibarev
3c0e49a770 [git] add aliases: stash unapply and full graph 
Added git aliases:
- "gsu": Stash unapply to revert applied changes
- "glG": Full graph (like glg but with author and date)

Closes #53
 2016-05-14 15:26:03 -07:00
Igor Zibarev
41b9b416a6 [git] fix "git rebase --continue" alias 
Renamed "git rebase --continue" alias from "grr" to "grc"
corresponding to README.md of git module.

Closes #53
 2016-05-14 15:25:54 -07:00
Matt Hamilton
43403bfcce [syntax-highlighting] update submodule 2016-05-14 13:55:45 -07:00
Georgy Yakovlev
d510f4f861 Fix for OpenBSD ls alias https://github.com/Eriner/zim/issues/47 
Closes #48
 2016-05-13 13:38:48 -07:00
Matt Hamilton
98f501a435 [pacman] fix pacor alias 
closes #43
 2016-05-07 23:49:46 -07:00
Matt Hamilton
2dc0de0f97 [syntax-highlighting] update submodule 2016-05-06 14:20:00 -07:00
Matt Hamilton
6dce750b4f [syntax-highlighting] update submodule 2016-05-02 07:36:32 -07:00
Matt Hamilton
296c457ead [prompt] update "pure" theme submodule 2016-05-02 07:36:18 -07:00
Matt Hamilton
0ca163733f [completion] update submodule 2016-05-02 07:36:04 -07:00
Tmplt
6cb9d54ffb [pacman] don't call sudo on pacaur 
like yaourt, pacaur also handles SUID itself.

Closes #38
 2016-04-18 19:45:11 -07:00
Matt Hamilton
4ac66646c4 [completion] add ${zcompdump_file} option 
This commit assumes that the user-provided variable for the filename
will start with '.zcomp'. This is used in the .zlogin for zcompiling the
completion file. Sourcing the .zimrc file within the .zlogin file is
something I'd rather not do, and this seems like a good compromise. If
this becomes an issue, the file can be sourced an the var can be used
instead.

Closes #42
 2016-04-16 14:56:53 -07:00
Cenk Gündoğan
fcc4c573a8 [prompt] fix gitster path to reflect git repo 
allow optional parameter for short_pwd

Closes #41
 2016-04-02 13:33:01 -07:00
Matt Hamilton
080852c490 [syntax-highlighting] update submodule 2016-04-02 11:54:18 -07:00
Matt Hamilton
983919fce4 [prompt] update "pure" theme submodule 2016-03-27 18:48:11 -04:00
Matt Hamilton
af608ab15b [syntax-highlighting] update submodule 2016-03-27 18:47:55 -04:00
Matt Hamilton
7d254b2e83 [substring-search] update submodule 2016-03-27 18:47:43 -04:00
Matt Hamilton
9b03840753 [completion] update submodule 2016-03-27 18:46:59 -04:00
Matt Hamilton
03f15c4495 [fasd] add initial fasd support 
[zlogin] zcompare fasd and all functions

[fasd] trim non-zsh options

[fasd] merge PR #75 from clvv/fasd

[fasd] partial merge PR #77 from clvv/fasd

This closes #24
 2016-03-27 18:45:05 -04:00
Matt Hamilton
f19a0268ee [syntax-highlighting] update submodule 2016-02-27 18:43:33 -05:00
Matt Hamilton
ee512c85a9 [completion] update submodule 2016-02-27 18:43:19 -05:00
Matt Hamilton
f404c5ba9f [prompt] update "pure" theme submodule 2016-02-17 10:09:36 -05:00
Matt Hamilton
1865d697ef [syntax-highlighting] update submodule 2016-02-15 10:23:28 -05:00
Matt Hamilton
e42afb7d99 [completion] update submodule 2016-02-10 04:16:59 -05:00
Matt Hamilton
0b4d0c1fff [syntax-highlighting] update submodule 2016-02-07 23:42:42 -05:00
Matt Hamilton
9468a6219a [prompt] update "pure" theme submodule 2016-02-07 23:42:16 -05:00
Matt Hamilton
a7824d788e [completion] update submodule 2016-02-07 23:41:49 -05:00
Matt Hamilton
7874b97bf1 [pacman] cleanup privileged vs unprivileged 
* moves check for yaourt into the other zpacman_frontend checks
* remove hardcoded sudo vs non-sudo; uses zpacman_frontend[_priv]
instead.
  * these vars are set in the zpacman_frontend value sanity check.
  * for values != yaourt, prepend sudo for zpacman_frontend_priv
 2016-02-06 15:45:31 -05:00
Matt Hamilton
0e19c3d277 [pacman] local pkg installs don't need a frontend 2016-02-05 22:14:54 -05:00
Tmplt
31180a5c5e [pacman] don't call sudo on yaourt 
As explained in #31, yaourt does not require to be called as root,
because it requests access by its own.

This closes #31 and closes #32
 2016-02-05 22:13:48 -05:00
Matt Hamilton
0c1aa6e133 [git] fix some functions 
* remove unneeded explination and authorship comments (as it's
noted in the README.md)

* s/git/command git/ (see issue #30)

* add is-true function, as it is required by a few other functions.
 2016-02-04 15:33:12 -05:00
Matt Hamilton
cb12222811 use 'command git' in prompts 
Fixes Zim issue with interation with any functions or aliases that wrap
'git'. See issue #30 for more information.
 2016-02-04 15:08:22 -05:00
Matt Hamilton
474715170b [utility] fix safe-rm alias 
Alternative approach to determine if aliasing safe-rm is viable.

If safe-rmdir is available, the OS is Suse (which has it's own safe-rm).
Note to Suse: you're making problems for me. Stop.

Closes #27
 2016-01-23 19:45:55 -05:00
Matt Hamilton
5ff931065f [utility] apply ch(mod|root) condoms only on linux 
Closes #26
 2016-01-23 15:04:52 -05:00
Matt Hamilton
bb680b3742 [utility] fix safe-rm condom on opensuse 2016-01-23 03:10:55 -05:00
Matt Hamilton
0dc32b8957 update submodules 2016-01-20 22:10:39 -05:00
Matt Hamilton
5bc9889ca4 update submodules 2016-01-18 17:39:30 -05:00
Matt Hamilton
95cc94d9a0 [utility] add setopt correct option 
This option can be enabled by setting `zcorrection='true'` in .zimrc

Closes #25
 2016-01-17 07:08:08 -05:00
Matt Hamilton
4cee50c2d6 [utility] docs: remove unneeded escape 2016-01-12 14:19:38 -05:00
Matt Hamilton
284f5cf3ba [spectrum] add FX var check 2016-01-12 13:07:27 -05:00
Matt Hamilton
e9398e91fd [spectrum] remove bloat options 2016-01-12 13:05:22 -05:00
KoharaKazuya
b23f7ec6d9 [prompt] fix gitster local var 
separate declaration and initialization of local array variable

Closes #21
 2016-01-12 09:03:21 -05:00
Matt Hamilton
050924256e update highlighting submodule 2016-01-11 23:33:35 -05:00
Matt Hamilton
aef41e25c5 [input] check for null bindkey values 
Only bind keys if length of var > 0

Hopefully these are the only keys that will require this testing. If
anyone encounters issues like issue #17 with additional keys, please
create an issue.

Closes #17
 2016-01-09 05:27:55 -05:00
Matt Hamilton
d13614e3bb [prompt] change unset variable test 
The old test, [[ ${var} ]] tests for unset AND zero-length strings.

Checking for zero length strings probably isn't that important. It is
enough to ensure that the variable is set.

Closes #18
 2016-01-08 09:16:22 -05:00
Matt Hamilton
7020eead86 [archive] correct unarchive aliases 2016-01-07 16:20:23 -05:00
Matt Hamilton
89b2986db9 cleanup function error messages 2016-01-07 15:36:31 -05:00
Matt Hamilton
9f838982fb [prompt] syntax refactor 2016-01-07 08:10:29 -05:00
caedus75
b46edd43a8 [prompt] add setup function to themes 
proper setup and preview of themes with 'prompt' function

closes #12, closes #15
 2016-01-07 08:07:11 -05:00
Matt Hamilton
5f68411637 [prompt] gitster: use short_pwd 2016-01-06 09:41:40 -05:00
Matt Hamilton
be23020b2e [prompt] eriner: use short_pwd 2016-01-05 04:15:21 -05:00
Matt Hamilton
69b194302c [prompt] add short_pwd func 2016-01-05 04:15:13 -05:00
Matt Hamilton
e9c87a227d re-word custom/init.zsh 2015-12-31 10:48:03 -05:00
Matt Hamilton
41c4ce7718 variable scoping 2015-12-30 10:00:56 -05:00
kee7a
711f65fbb3 fixed typo in the custom module 
Closes #9
 2015-12-30 07:16:28 -05:00
caedus75
f2806b45bf fix prompt substitutions/expansions 
The 'prompt' function disables any option set with 'setopt'.
To make options persistent we need to use the 'prompt_opts' array
instead

Closes #8
 2015-12-30 04:42:31 -05:00
Matt Hamilton
534e627331 cleanup pacman module and options 2015-12-29 14:51:08 -05:00
Matt Hamilton
b7977d28f2 add powerline symbols note 2015-12-29 11:19:36 -05:00
Matt Hamilton
641ade3fbd fix bindkeys 
this fixes the ctrl+arrowkey binds, as well as the binds for Home and
End.
 2015-12-29 09:11:17 -05:00
Matt Hamilton
be99dc0971 add comments and fix BSD ls typo 2015-12-29 05:34:13 -05:00
Matt Hamilton
b28cdf2f13 fix ls alais for BSD systems 2015-12-29 05:32:02 -05:00
Matt Hamilton
b6b3620f34 not in a function; remove local 2015-12-28 01:56:07 -05:00
Matt Hamilton
9c84d1904c unset pacman helper var 2015-12-28 01:46:08 -05:00
Matt Hamilton
1ee4d85547 fix gitster prompt 2015-12-27 21:13:08 -05:00
Matt Hamilton
598326aa9f fix minimal prompt 2015-12-27 21:11:58 -05:00
Matt Hamilton
5cccdc255b cleanup trace function a bit 2015-12-27 19:33:30 -05:00
Matt Hamilton
50c8f70179 add debug module 2015-12-27 19:13:57 -05:00
Matt Hamilton
e6068a7ede zsh 5.1.1 url-quote-magic requires bracketed-paste 2015-12-27 04:00:20 -05:00
Matt Hamilton
599add14b9 use is-at-least to determine version 2015-12-27 03:58:01 -05:00
Matt Hamilton
11aaff5614 Compare version as float 
ZSH_VERSION isn't guarenteed to be a float (5.1.1). In this case, it
should be safe to just strip it to a float: 5.1(.1)

closes issue #3
 2015-12-27 03:46:50 -05:00
Matt Hamilton
4a934de754 add url-paste "if" based on ZSH_VERSION 2015-12-26 00:45:41 -05:00
Matt Hamilton
add7f40799 fix broken variable 2015-12-23 05:13:09 -05:00
matt hamilton
4acb1660f4 fix ssh_{env,agent} vars 2015-12-23 08:57:13 +00:00
Matt Hamilton
5572a2330d update steef again 2015-12-22 10:52:15 -05:00
Matt Hamilton
6fa8dcb95d update steeef prompt 2015-12-22 09:47:19 -05:00
Matt Hamilton
d52993c70e add 'custom' module for easy customization 2015-12-22 05:55:48 -05:00
Matt Hamilton
9302507257 use sane dir if $TMPDIR is not set 2015-12-21 20:34:55 -05:00
Matt Hamilton
fb549f108a use autoload -Uz, not -U 2015-12-21 20:16:43 -05:00
Matt Hamilton
b0bf9d2ebc load-time optimizations 2015-12-20 20:42:48 -05:00
Matt Hamilton
fd826dbd8a fixup pigz and pbzip2 in (un)archive funcs 2015-12-19 17:08:43 -05:00
Matt Hamilton
1b2176534a add utility module comments 2015-12-19 17:05:43 -05:00
Matt Hamilton
dcc3265987 remove git-hub functions 2015-12-19 09:49:11 -05:00
Matt Hamilton
a1a56ac63f use consistent variable style 2015-12-19 09:48:29 -05:00
Matt Hamilton
08c9987b38 symlink git_current_branch to git-branch-current 2015-12-19 09:42:09 -05:00
Matt Hamilton
c577d77fc4 update history-substring-search 2015-12-18 14:03:40 -05:00
Matt Hamilton
3fce9ee626 move themes to wiki, add links 2015-12-18 12:04:35 -05:00
Matt Hamilton
02ec35a8d4 add gitster theme 2015-12-18 11:02:56 -05:00
Matt Hamilton
f2f0346864 add git_current_branch for theme compatibility 2015-12-18 10:57:19 -05:00
Matt Hamilton
5cf08f503f add minimal prompt 2015-12-18 10:51:58 -05:00
Matt Hamilton
a08039ca4a add locale safety and user check 2015-12-18 10:11:49 -05:00
Matt Hamilton
3e6785c993 add oh-my-zsh theme compatibility git funcs 2015-12-18 09:45:36 -05:00
Matt Hamilton
9d6952400d fix aria2c typos 2015-12-18 07:23:00 -05:00
Matt Hamilton
818beef89d add liquidprompt 2015-12-18 03:56:51 -05:00
Matt Hamilton
c58e75ca82 add pure prompt 2015-12-18 03:49:51 -05:00
Matt Hamilton
c80bc6d86d add utility aliases 2015-12-18 02:46:16 -05:00
Matt Hamilton
2fee647a56 fix unzip in unarchive function 2015-12-17 14:04:33 -05:00
Matt Hamilton
be24df6e8d add pacown and pacblame aliases 2015-12-17 11:28:30 -05:00
Matt Hamilton
3ccdaa967d update i.eriner.me links to https 2015-12-17 11:04:01 -05:00
Matt Hamilton
de48f8b873 submodule repos ssh -> https 2015-12-17 05:24:31 -05:00
Matt Hamilton
8e4fc03038 update completion docs to reflect zmodules order 2015-12-17 03:06:12 -05:00
Matt Hamilton
01838f0083 add compdef for pacman aliases 
The recommended order for the module loading has been changed. The last
module to be loaded should be 'completion'. This ensures all completions
set by other modules are dumped and included in the completion.
Because of this, any compdefs like this one (making the pacman aliases
use pacman completion) must be set in the compdefs.zsh file, and loaded
with the completion module. This means the compdefs must be wrapped with
conditional statements to ensure such aliases/functions have been set by
previous modules. I may abstract this conditional to a function in the
future to make this an easier process.
 2015-12-17 03:06:12 -05:00
Matt Hamilton
a8aa59e09d cross-reference history-substring-search 2015-12-16 18:08:28 -05:00
Matt Hamilton
fd8b5ca369 note module order for history-substring-search 2015-12-16 18:05:50 -05:00
Matt Hamilton
d00cfeec71 fix utility documentation formatting 2015-12-16 17:51:11 -05:00
Matt Hamilton
74abfe00a8 s/fish-shell-like/fish shell-like 2015-12-16 17:49:36 -05:00
Matt Hamilton
59df35d64b re-word spectrum docs for more accurate description 2015-12-16 17:47:46 -05:00
Matt Hamilton
646902d3c6 add sparse (will fixup later) spectrum documentation 2015-12-16 17:45:56 -05:00
Matt Hamilton
18e2d7cf1a reword prompt documentation 2015-12-16 17:37:59 -05:00
Matt Hamilton
d431cbd338 fix documentation typo 2015-12-16 17:35:46 -05:00
Matt Hamilton
ceb0f3ad2a add archive module 2015-12-16 17:00:25 -05:00
Matt Hamilton
2f9b8437e2 It is probably better to prepend ranther than append 2015-12-16 14:56:54 -05:00
Matt Hamilton
1cc0a19e14 remove dupe zmodload 2015-12-16 01:24:31 -05:00
Matt Hamilton
f32e763604 rename and fix input docs 2015-12-16 01:23:31 -05:00
Matt Hamilton
6ca71da68d update documentation and enable input module by default 2015-12-16 01:22:33 -05:00
Matt Hamilton
79995ae5ee add inputs module 2015-12-16 01:15:30 -05:00
Matt Hamilton
2a4e052939 fix typo, thanks Mikachu 2015-12-16 00:35:12 -05:00
Matt Hamilton
d916ad2967 pacman conditional is broken 2015-12-16 00:01:57 -05:00
Matt Hamilton
6655251240 fix symlink, not sure how they broke 2015-12-15 22:19:11 -05:00
Matt Hamilton
66941895f6 update function names in eriner prompt 2015-12-15 21:51:28 -05:00
Matt Hamilton
390d6d39a5 g.. alias s/echo/print 2015-12-15 20:57:23 -05:00
Matt Hamilton
25cec0876a update eriner prompt 2015-12-15 19:21:06 -05:00
Matt Hamilton
495bde2404 add utility documentation 2015-12-15 18:49:15 -05:00
Matt Hamilton
e8936eb69e add syntax-highlighting documentation 2015-12-15 18:42:44 -05:00
Matt Hamilton
267940385d add ssh documentation 2015-12-15 18:36:36 -05:00
Matt Hamilton
0783d12ca3 add steef prompt 2015-12-15 14:05:59 -05:00
Matt Hamilton
27fa153b83 add prompt documentation 2015-12-15 03:04:25 -05:00
Matt Hamilton
56c5d51ab8 add pacman documentation 2015-12-15 03:00:26 -05:00
Matt Hamilton
83476386b0 add history documentation 2015-12-15 02:47:54 -05:00
Matt Hamilton
434232b5c6 add history-substring-search documentation 2015-12-15 02:37:10 -05:00
Matt Hamilton
02fbd3d582 correct markdown link format 2015-12-15 02:30:31 -05:00
Matt Hamilton
014ca7cdcd add git documentation 2015-12-15 02:29:48 -05:00
Matt Hamilton
8678752d91 fix typos 2015-12-15 02:17:37 -05:00
Matt Hamilton
a11c36c305 add environment documentation 2015-12-15 02:15:54 -05:00
Matt Hamilton
f823d50baf add directory documentation 2015-12-15 02:07:46 -05:00
Matt Hamilton
3141d29d25 add completion documentation 2015-12-15 02:07:30 -05:00
Matt Hamilton
3a62391e0e initial commit 2015-12-15 00:12:17 -05:00