Commit Graph

550 Commits

Author SHA1 Message Date
Anthony Gelibert
b87e0c0f9f Corret LC_ALL setting in git branch. 2013-11-28 00:02:50 +01:00
Anthony Gelibert
da940677ee Correct a bug in git parsing. 2013-11-28 00:00:16 +01:00
Anthony Gelibert
141131502a zsh compat: separate variable declaration from first set 2013-11-27 23:56:05 +01:00
George Macon
02d6f3f376 Update mac-battery support to use pmset instead of ioreg
pmset's output is much closer to the point.
2013-11-27 12:32:25 +01:00
George Macon
d66cafb86a Enable battery on Mac OS X
This uses ioreg to read the battery status.  This was tested on
Mac OS 10.8.3, but will probably work a few versions back as well.
2013-11-27 12:32:25 +01:00
Ryan Wilson-Perkin
75afb57855 Fix #124: zsh magic of %~ with environment variables
unset local variables that interfere with autonamedirs in oh-my-zsh
1) unset local variable p before use in zsh pwd truncation
2) prefix LP_OLD_PWD with "LP:" to avoid autonaming
2013-11-26 23:27:57 +01:00
Olivier Mengué
0898c39bf5 Add a CONTRIBUTING file 2013-11-26 20:09:29 +01:00
Taahir Ahmed
c7c57732a2 Fixed an error in _lp_upwards_find, and enhanced it slightly.
_lp_upwards_find was using a single-quoted $@, not double-quoted, so
find was actually looking for files called '$@'.

In addition, once _lp_upwards_find finds the file it's looking for, it
breaks out so it doesn't need to always traverse to root.  I doubt
this actually saves much in practice, but it might as well be there.
2013-11-26 09:08:33 +01:00
Taahir Ahmed
31a86c9327 Added "upwards find" tests for expensive dvcs.
Mercurial and Bazaar are written in Python, which, on my system,
causes a noticeable hitch in the prompt generation when changing
directories.  I have added code that, before invoking the 'hg' or
'bzr' executables, first tests if we could possibly be in a bazaar or
hg repository checkout by traversing the directory structure upwards
to the root, looking for an '.hg' or '.bzr' folder.

At least for me, this makes the prompt instantaneous.  There may be
more elegant solutions to this problem, but this one works.
2013-11-26 09:04:32 +01:00
Olivier Mengué
7fe87a5cf5 Revert fix applied on the wrong branch (lp_temp_sensors)
Revert "Added null check for count in _lp_temp_sensors() to stop division by zero errors in case count is still zero."
Closes #214.
Thanks @jaesivsm

This reverts commit 9d96a82c80.

Conflicts:
	liquidprompt
2013-11-25 23:12:43 +01:00
Olivier Mengué
6da1e9bc6a Fix a typo in variable name that makes a variable leak
Closes #232.
2013-11-25 22:45:36 +01:00
Olivier Mengué
bc4450e3ec _lp_git_branch: minor optimization 2013-08-20 20:09:26 +02:00
Olivier Mengué
aeb0a6afed Fix initialisation of _LP_RUNTIME_LAST_SECONDS 2013-08-01 08:23:42 +02:00
Olivier Le Thanh Duong
7bf1b9f055 [doc] Add instruction on how to install via antigen 2013-07-26 10:36:18 +02:00
Olivier Mengué
bf8ef5b513 Bypass shell aliases on the 'git' command. Closes #213 2013-07-26 10:30:50 +02:00
nojhan
635285fbc4 Merge branch 'mainerror-master' into develop
Conflicts:
	liquidprompt
2013-07-07 15:25:56 +02:00
nojhan
0a161a6d3f Use the same convention for test as elsewhere in the code 2013-07-07 15:22:19 +02:00
nojhan
3a6798334d Merge branch 'runtime-squashed' of https://github.com/mrks/liquidprompt into mrks-runtime-squashed 2013-07-07 15:12:31 +02:00
nojhan
993979c213 Merge branch 'dxtr-openbsd' into develop
Conflicts:
	liquidprompt
2013-07-07 15:08:48 +02:00
Kim Lidström
2f2f79f9d6 Made _lp_cpu_load more consistent under OpenBSD 2013-07-01 14:01:16 +02:00
Kim Lidström
8624a4f6c6 Added OpenBSD support 2013-07-01 13:42:48 +02:00
Octavian Damiean
9d96a82c80 Added null check for count in _lp_temp_sensors() to stop division by zero errors in case count is still zero. 2013-06-30 22:04:00 +02:00
Markus Dreseler
f783e5f979 Changed expr to bash arithmetic expression 2013-06-24 11:57:20 +02:00
Markus Dreseler
b075b46c85 Added runtime displaying 2013-06-23 12:30:44 +02:00
nojhan
a39c2c8342 do not unset LP_OS, used in _llp_set_prompt (at runtime) 2013-06-19 21:24:55 +02:00
Olivier Mengué
e79a8707f0 FreeBSD, Darwin: _lp_cpu_load improvements
FreeBSD: fixed _lp_cpu_load
Darwin: optimized _lp_cpu_load

Note that this change may break syntax coloring in Vim if Vim is not
configured to read the file as 'bash'. Workaround: create a symbolic
link with a '.bash' extension and open that file.
2013-06-17 21:09:43 +02:00
Olivier Le Thanh Duong
907f956452 [enh] Add support for antigen autoloading 2013-06-16 22:05:03 +02:00
Olivier Mengué
a5e7418c5f README: fix typo (closes #202) 2013-06-16 22:01:57 +02:00
Olivier Mengué
4492860d59 README: fix typo (closes #202) 2013-06-15 20:06:04 +02:00
Olivier Mengué
46db8c53c9 Fix mark for root
I broke it in cf2ff289c8.
Thanks to François Schmidts who immediately noticed the bug and produced
a patch (but that I choose to not apply).
Closes #201.
2013-06-13 02:32:20 +02:00
Olivier Mengué
78176780e0 Optimize _lp_smart_mark more: case .. esac
Use a 'case..esac' in _lp_smart_mark.
2013-06-13 02:26:40 +02:00
Olivier Mengué
0381fb68e0 Optimize _lp_smart_mark
Remove one _LP_SHELL_zsh test from runtime.
Introduce _LP_MARK_SYMBOL.
2013-06-13 02:13:17 +02:00
Olivier Mengué
c1f04183c3 Cleanup _lp_connection once done with it 2013-06-13 00:31:56 +02:00
Olivier Mengué
a7dd161877 Inline LP_PROXY building 2013-06-13 00:25:39 +02:00
Olivier Mengué
c65beba85c Color map: zsh fixes 2013-06-12 15:21:11 +02:00
Olivier Mengué
f610ed4f2b Add LP_DEBUG_TIME for bash: if 1 shows PS1 build time
Doesn't work on zsh: looks like 'time' doesn't output anything if
applied to a shell function. Need a zsh expert.
2013-06-12 15:13:33 +02:00
Olivier Mengué
cf2ff289c8 Root: huge optimisation (and security feature) for VCS directories
If under root user, for VCS directories we do not collect anymore the
VCS status information. Before it was collected (even if
LP_ENABLE_VCS_ROOT=0, which is the default) but just not displayed.
This is a huge optimisation for VCS directories, and also a security
feature, as our shell code is absolutely not resistant to specially
crafted VCS content.
2013-06-11 22:54:44 +02:00
Olivier Mengué
aad57e8497 Move common code to 2 branches of an 'if' out of it
Still optimizing EUID...
2013-06-11 22:37:14 +02:00
Olivier Mengué
cc839487ec Optimize as $EUID can't change during the shell life
$EUID will not change during the shell life. So we can optimize color
selection at liquidprompt startup instead of testing multiple times
every time the prompt is shown.
Optimizes LP_MARK and LP_PWD.
2013-06-11 22:34:36 +02:00
Olivier Mengué
a31d37edad smart mark: lowercase variable for code style consistency 2013-06-11 22:14:26 +02:00
Olivier Mengué
91f5409c43 Rename variable _lp_temp_function to _LP_TEMP_FUNCTION for consistency 2013-06-11 22:06:20 +02:00
Olivier Mengué
aa5e3f3591 _lp_temperature: fix variable leak 2013-06-11 22:00:48 +02:00
Olivier Le Thanh Duong
d6375dd46d [enh] Add support for antigen autoloading 2013-06-11 21:20:24 +02:00
Olivier Mengué
3b246ecae3 Simplify color map lookup
Thanks to François Schmidts (jaesisvm) for the previous work.
2013-06-11 21:03:10 +02:00
François Schmidts
7b631646a3 the _lp_color_map will use a scale system
and not a step one
2013-06-11 20:24:07 +02:00
François Schmidts
d104b275a1 _lp_color_map is now able to adjust to different scales
Given a second parameters, _lp_color_map is now able to display
different colors depending on a scale. The second parameter is the
lowest step on the scale and ten times it the highest.
2013-06-11 20:23:54 +02:00
François Schmidts
43c7016c34 _lp_temp_sensors : a better use of sed
closes #189
2013-06-10 09:58:29 +02:00
nojhan
4610756387 Merge pull request #193 from np/zshcompat
Zshcompat: More quotes to improve Zsh compatibility
2013-06-03 02:55:44 -07:00
nojhan
0186f7bc9c Merge pull request #192 from np/zsharrays
Fix compatibility with Zsh arrays
2013-06-03 02:54:46 -07:00
Nicolas Pouillard
ebd3ef9bc1 More quotes to improve Zsh compatibility
This commit changes most of the occurrences of
  x=$(cmd)
into
  x="$(cmd)"

When cmd is returning multiple words or lines Zsh interprets
them as an array. Putting those quotes ensures we get a single
string with spaces inside.
2013-06-02 12:14:58 +02:00