Commit Graph

485 Commits

Author SHA1 Message Date
baadcd7af7 Merge branch 'fix/zsh-grep-alias' 2015-01-07 16:58:36 -05:00
b199d934cd Merged feature/zsh-rps1 2015-01-07 16:58:31 -05:00
3aed61a76b Disable aliased grep 2015-01-07 16:51:57 -05:00
c82958bc83 Added RPS1 for ZSH prompts 2015-01-07 16:46:27 -05:00
c4ca0b1093 Merged from main project 2015-01-05 16:40:12 -05:00
44902da46f Fixed syntax highlighting 2015-01-05 16:38:00 -05:00
Kevin Yap
dbe3c15026 Miscellaneous grammatical & consistency changes
- Various grammatical changes and rephrasings
- Capitalize names of VCSes and "Bash"
- Standardize references to project name ("Liquid Prompt")
- Use title casing in README section headers
- Use multiple list-levels in README where appropriate
- Fix code block in pull request instructions in CONTRIBUTING
2014-12-08 23:00:17 -08:00
ba683626a7 Oh My Git! support 2014-11-16 11:42:22 -05:00
7b42500485 Added RPS1 for ZSH prompts 2014-11-16 10:54:22 -05:00
Bartosz Janda
d55f678022 Fixed battery status on Apple computers without battery, like iMacs. 2014-11-08 16:52:25 +01:00
Olivier Mengué
1c657481fd _lp_temp_acpi: guard against any future l10n of 'acpi' 2014-08-19 01:07:35 +02:00
Olivier Mengué
7402f79a75 _lp_temp_acpi: simplify regexp 2014-08-19 01:06:16 +02:00
Vincent Lara
71321c84ab Handle neagative temperature in _lp_acpi_temp 2014-08-19 01:03:08 +02:00
Olivier Mengué
53ce540a28 _lp_load_color: fix $variable inside (( )) 2014-07-09 23:27:18 +02:00
Olivier Mengué
008c1337e8 LP_ERR: assign '' (code style suggestion by shellcheck) 2014-07-09 23:18:43 +02:00
Olivier Mengué
13afd583d9 _lp_fossil_branch_color: fix $variable inside (( )) 2014-07-09 23:09:14 +02:00
Olivier Mengué
134347e252 _lp_svn_branch: fix quoting 2014-07-09 23:07:19 +02:00
Olivier Mengué
df277cb501 lp_set_dirtrim: fix quoting 2014-07-09 23:05:08 +02:00
Olivier Mengué
2da0c12fd1 _lp_shorten_path: clean variable usage inside (( )) 2014-07-09 22:56:11 +02:00
Olivier Mengué
ddac1d8ec5 Quoting fixes 2014-07-09 22:52:56 +02:00
Olivier Mengué
a7657ec622 Fix _lp_bool 2014-07-09 22:50:05 +02:00
Olivier Mengué
d48aba79a9 _lp_cpu_load: fix quoting on Darwin/BSD 2014-07-09 22:48:49 +02:00
Olivier Mengué
9633ac83ca hostname: fix LP_ENABLE_SSH_COLORS
Colorization of the hostname based on a hash of the name was broken for
some time because t_setaf was not available where LP_COLOR_SSH was used.
2014-07-01 00:32:46 +02:00
Olivier Mengué
d5ac06e711 Simplify % escape for zsh 2014-07-01 00:07:06 +02:00
Olivier Mengué
ee6343567d lp_battery_color: optimize colormap code when LP_PERCENT_ALWAYS=1
Better code (less comparisons) for colorization of the battery level
percent value.
2014-07-01 00:05:50 +02:00
Olivier Mengué
ed4f3832fe Remove variable LP_LIQUIDPROMPT, redundant with LP_OLD_PS1 2014-06-30 22:28:52 +02:00
Olivier Mengué
62f0270888 bash: save and set shell option promptvars 2014-06-30 19:42:51 +02:00
Olivier Mengué
c98f16d52f Subversion: fix branch/tag extraction
That was broken for a long long long... time.
Should close #117, #237 and is an alternative to patch proposed by
@anthonygelibert in #264.
2014-06-28 22:27:32 +02:00
Chase Colman
89a71c1c7d Fix _lp_bzr_branch_color for zsh
Fixes #301 without affecting bash functionality
2014-06-28 02:06:03 +02:00
Olivier Mengué
e26c075f63 Fix typos in code comments
Thanks to @pkkolos for catching them in
1eb35f46b0
2014-06-28 01:57:24 +02:00
Olivier Mengué
d725e791ee Simplify LP_MARK_DEFAULT definition
Thanks for inpiration to @pkkolos.
2014-06-28 01:49:56 +02:00
Panayiotis Kkolos
98cbca4786 Fix mark prefix
Now the prompt mark can be at the beginning
of a new line without a space before it.

Conflicts:
	liquidprompt
2014-06-28 01:18:13 +02:00
Panayiotis Kkolos
7e7734e624 Count merge commits in git when checking differences with tracking remote branch 2014-06-28 00:36:54 +02:00
Olivier Mengué
0e0cc870c2 Simplifiy git working tree detection
Thanks to @pkkolos (Panayiotis Kkolos <pkkolos@gmail.com>) for the inspiration.
63e1b8229b
2014-06-28 00:29:16 +02:00
Panayiotis Kkolos
4572bd02fa Fix *BSD support for terminal colours 2014-06-28 00:17:51 +02:00
Panayiotis Kkolos
81b080e2a6 Fix LP_OLD_PROMPT_COMMAND to work with zsh 2014-06-28 00:07:22 +02:00
Panayiotis Kkolos
b4939868ce Synchronize rc, theme, and ps1 files with main file 2014-06-28 00:07:01 +02:00
Panayiotis Kkolos
cbba559340 Simplify chroot detection code 2014-06-27 23:11:11 +02:00
Olivier Mengué
82425e51b0 More _lp_jobcount_color refactoring 2014-06-27 22:00:36 +02:00
Olivier Mengué
07d18d4ca3 Fix #304: _lp_jobcount_color() when is tmux not installed
Refactor _lp_jobcount_color() to avoid running either 'screen' or 'tmux'
if they are not installed.
2014-06-27 21:49:44 +02:00
Olivier Mengué
50a3867819 Add utility function _lp_bool
_lp_bool converts a return code (default to $?) into a "true"/"false"
value.
2014-06-27 19:54:00 +02:00
Linus Wallgren
5813a710fc Simplified unwanted tilde expansion handling
The idea comes from https://github.com/edkolev/promptline.vim/pull/11
2014-06-10 18:07:39 +02:00
Olivier Mengué
dc7be2540d From #291: fix $TERM check
Thanks to Daniel Serodio (@dserodio) for the catch.
2014-05-30 22:40:01 +02:00
nzwulfin
cc1be7e29d Enable support for Software Collections
Fedora, RHEL, and CentOS provide support for multiple versions of
the same software components using Software Collections.  This
patch lists the active collections in a similar manner to Python
virtualenvs.
2014-05-30 22:30:55 +02:00
Linus Wallgren
db25aedffe Handle bug in bash 4.2 with tilde expansion
Pattern substituion in bash 4.2 was faulty, which caused tilde to not be
expanded in certain cases. This behaviour was previously relied on, now
we are only using that behaviour as a fallback on bash 4.2.

This resolves issue #289
2014-05-30 22:29:12 +02:00
Brett McBride
5425a5eb56 SVN: Support for paths that are not branches or trunk
Also fallback to displaying the repo's root name in the case where the
repo path is none of tags/branches/trunk
2014-04-05 13:22:53 +02:00
Cosmin L. Neagu
e9279856c4 add vcsh support (#148) 2014-04-05 13:15:30 +02:00
alexbel
5cc46c68d8 Fix incorrect detection of tmux output if tmux is not installed 2014-04-05 13:10:36 +02:00
Olivier Mengué
c71abe49a5 Fossil: use internal diff (fossil diff -i)
Thanks to @sekiroh for the tip...
2014-02-20 21:35:57 +01:00
Olivier Mengué
f24a41d911 Fix tabs 2014-02-20 21:09:42 +01:00