Commit Graph
985 Commits
Author SHA1 Message Date
Dominik Ritter ebbdb3c1c0 Make purpose clear of backgroundColor and foregroundColor functions
The functions just start the colors, they do not end them. It seems
too much to have a function that terminates a color.
2018-08-07 21:21:15 +02:00
Dominik Ritter 3b8f0abdb2 Merge remote-tracking branch 'docwhat/pr/sudo-check' into prepare_066 2018-08-06 00:26:23 +02:00
Dominik Ritter aca20ae463 Merge branch 'add_tests' into prepare_066 2018-08-06 00:17:23 +02:00
Christian Höltje 7f6ac8dbac Use SUDO_COMMAND to check for sudo
`sudo -n true` only checks that we _could_ use `sudo`, not if we are in
a sudo session.

closes #852
2018-07-31 16:22:26 -04:00
Ben Hilburn 571a859413 Merge pull request #912 from brandon14/laravel_pormpt_fix
[Bugfix] Fix error in laravel_version when artisan is not present
2018-07-23 14:34:00 -04:00
Brandon Clothier 9739c68894 Missed a parenthesis here. 2018-07-22 21:55:44 -04:00
Ben Hilburn e70ce43809 Merge pull request #915 from onaforeignshore/fix_truncate_to_unique
[Bugfix] Fix for "truncate_to_unique" strategy
2018-07-19 08:46:27 -04:00
Dominik Ritter 7a7b4ee13a Merge remote-tracking branch 'ben/master' into add_tests 2018-07-19 07:44:16 +02:00
Dominik Ritter 671f826a40 Set background color of vi_mode segment to white in insert mode 2018-07-19 07:42:09 +02:00
Dominik Ritter 7a3aa9d3d1 Change swap segment to take an optional root prefix for testability 2018-07-18 22:26:08 +02:00
Dominik Ritter e99c7549fb Change ram segment to take an optional root prefix for testability 2018-07-18 22:24:25 +02:00
Dominik Ritter 04168cc5c0 Change load segment to accept an optional root prefix for testability 2018-07-18 22:20:16 +02:00
Dominik Ritter 43272410c9 Change ip segment so that the tests can be executed on OSX as well
Change regular expressions to a more compatible format.
2018-07-18 22:17:54 +02:00
Dominik Ritter b61d021abd Simplify detect_virt segment 2018-07-18 22:15:35 +02:00
Dominik Ritter 629d52a7d5 Add visual identifier to custom segments 2018-07-18 22:13:25 +02:00
Christo Kotze dd25b5db12 truncate_to_unique - simplified the code 2018-07-18 19:46:31 +04:00
Brandon Clothier ef1f29a5cb Drop grep usage in favor of zsh regex test 2018-07-18 11:45:05 -04:00
Christo Kotze 38c8519f10 Changed getUniqueHomeFolder to use $HOME
It is a Posix specification that $HOME be set, so we can use that.
See http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
2018-07-18 19:26:15 +04:00
Alexara Wu cff11d2e82 Fix pyenv segment 2018-07-18 04:14:34 +08:00
Christo Kotze 29c85be8d9 Fix for "truncate_to_unique" strategy 2018-07-17 12:17:21 +04:00
Dominik Ritter 802af322ff Add tests for battery segment
Additionally
- Add a fourth parameter to prompt_battery for better testability. This
  parameter is the root prefix, so we can use our own test batteries.
2018-07-16 20:48:27 +02:00
Ben Hilburn 22a761208d Merge pull request #900 from AlexaraWu/patch/pyenv
Fix `pyenv` segment
2018-07-16 11:01:00 -04:00
Brandon Clothier 48b264f564 Fix error in laravel_version when artisan is not present 2018-07-14 18:24:10 -04:00
Alexara Wu 45fe401dc2 Improve conditions in rbenv & pyenv 2018-07-14 20:41:15 +08:00
Alexara Wu 9f09547ad1 Improve rbenv as well 2018-07-14 17:09:56 +08:00
Alexara Wu 25e2064f0e Improve command check 2018-07-14 06:32:07 +08:00
Ben Hilburn a7b3f310d3 Merge pull request #905 from robobenklein/robobenklein/defined-variable-performance-hotfix
[performance] Defined function 2-20 times speedup
2018-07-13 13:25:45 -04:00
Dominik Ritter 8cd39beaad FIx status segment 2018-07-12 08:13:52 +02:00
Ben Klein 002f7b81a1 Replace [[-v with defined
For zsh 5.1 compatibility.
2018-07-11 16:54:12 -04:00
Alexara Wu fc39d9d6b8 Fix pyenv segment 2018-07-11 20:55:27 +08:00
Dominik Ritter d031b3e035 Fix kubernetes segment 2018-07-09 21:30:28 +02:00
Ben Hilburn 579887d294 Merge branch 'master' into next 2018-07-09 09:06:51 -04:00
Kevin McBride 534ec66466 kubecontext: fix context, namespace comparison 2018-07-02 13:33:23 -07:00
Dominik Ritter bda3171237 Fix java_version segment 2018-06-20 22:55:14 +02:00
Dominik Ritter 08a3801c81 Merge remote-tracking branch 'softmoth/clean-right-margin' into staging_065 2018-06-20 21:23:38 +02:00
Dominik Ritter d09a46f9e0 Mute errors when asking for java version 2018-06-17 22:47:43 +02:00
Tim Smith 3989834bfe Hide one-space indent at right margin
ZSH displays the right prompt indented one space from the right
margin. This can be tweaked with ZLE_RPROMPT_INDENT=0, but that
makes display problems very likely and I don't recommend it. But
all is not lost.

The %E prompt format does continue the current background color
through that last indent space. So it can *look* like our prompt
goes right up to the margin, if:
1) We remove the trailing space from the last segment, and
2) We add %E before clearing the background color
2018-06-15 00:42:48 -06:00
Dominik Ritter 51b53cd4b5 Fix rbenv segment after merge 2018-06-09 14:37:56 +02:00
Dominik Ritter dc21b97335 Fix travis build 2018-06-07 02:36:30 +02:00
Dominik Ritter a2d8cccd09 Add a Laravel version segment 2018-06-07 01:54:32 +02:00
Dominik Ritter d9d9fb9b6b Merge remote-tracking branch 'ytang/fix-icons-cut-off' into staging_065
Conflicts were:
- test/segments/command_execution_time.spec and
test/segments/go_version.spec: All conflicts come from renaming color
names on next (#703) and adding a whitespace to the Visual Identifier
(#854) on master.
2018-06-07 01:51:16 +02:00
Dominik Ritter 40219759bb Merge branch 'fix_rprompt_newline' into staging_065 2018-06-07 01:29:04 +02:00
Dominik Ritter 47e2aed4b2 Merge remote-tracking branch 'sambadevi/feature/etc-option-in-dir-segment' into staging_065 2018-06-07 01:27:15 +02:00
Dominik Ritter db76380563 Merge remote-tracking branch 'sambadevi/feature/hide-battery-segment' into staging_065 2018-06-07 01:25:24 +02:00
Dominik Ritter 3456af3aac Merge remote-tracking branch 'opes/chruby_options' into staging_065 2018-06-07 01:21:16 +02:00
Dominik Ritter d3500625ca Merge remote-tracking branch 'TheDan64/master' into staging_065
Conflicts were:
- test/segments/rust_version.spec and powerlevel9k.zsh-theme. #826
removes grep from parsing the rust version on next; #703 changes color
names.
2018-06-07 01:00:57 +02:00
Dominik Ritter e763fa14b0 Merge remote-tracking branch 'chhschou/master' into staging_065
Conflicts were:
- powerlevel9k.zsh-theme and test/segments/rust_version.spec:
rust_version Segment changed (#641) on master and colors got
names (#703) on next.
2018-06-07 00:44:47 +02:00
Dominik Ritter 4c2f58bdbd Merge remote-tracking branch 'VanRoy/master' into staging_065
Conflicts were:
- functions/icons.zsh: The Java Segment was added on master, but on next
were added various Segments with icons in the meantime.
- powerlevel9k.zsh-theme: Java Segment was added on master, Dropbox
Segment was added on next.
2018-06-07 00:11:15 +02:00
Dominik Ritter 55473c450a Merge branch 'master' into staging_065
Conflicts were:
- README.md: Two commits targeted the brightness table. #781 from
14. April 2018 on master and #684 from 05. December 2017 on next.
- powerlevel9k.zsh-theme: Two commits targeted the rbenv segment. Both
achieve the same thing: To show the Ruby version number always. #795 on
next from 14. April 2018 and #610 on master from 28. September 2017. I
went with #795 here as this - although being newer - is the one on
master, and that should be more stable.
2018-06-06 23:40:37 +02:00
Yang Tang 9c4203bdf8 Add comments about the whitespace and coloring 2018-06-01 14:18:18 -04:00