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.
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.
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.
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.
`$pipestatus` is returning all zeros when using `[[ ]]` expressions
that are false.
This works around it by using `$status` (A.K.A. `$?`) when `$pipestatus`
has only 1 items.
Fixes#749
Added comments throughout the code
Added `truncate_to_last` - displays only the current folder
Added `truncate_absolute` - displays only the last
POWERLEVEL9K_SHORTER_DIR_LENGTH characters - see #736
Added `function truncatePath()` to utilities.zsh to take care of
truncation. This is pure zsh code, without calls to `sed`. Parameters
are:
* $1 Path: string - the directory path to be truncated
* $2 Length: integer - length to truncate to
* $3 Delimiter: string - the delimiter to use
* $4 From: string - "right" | "middle". If omited, assumes right.
Cleaned up code to use the new function instead.
Dominik Ritter
Tim Otlik
Daniel Kolsoi
Tim Otlik
Dan
Dan
Ben Hilburn
Ryan Davidson
Christian Höltje
Julien Roy
Conrad Haupt
Christo Kotze
Logan Brown