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
Nicolas Pouillard
37d0777b74
Fix compatibility with Zsh arrays
...
* Zsh arrays starts at 1
* Zsh arrays have to be declared before being assigned
2013-06-02 11:03:58 +02:00
nojhan
8757c58243
Merge pull request #191 from jaesivsm/develop
...
light bug in "git diff --shortstat" parsing
2013-05-28 02:07:20 -07:00
François Schmidts
6104394764
fixes the parsing of git --shortstat
...
now the parsing work either there is only deletion or only insertions or both
2013-05-28 00:34:35 +02:00
François Schmidts
430d9bf6b9
light bug in "git diff --shortstat" parsing
...
the string substitution assumed "insertions" was always plural, but git
actually takes care of suffixing insertion with an "s" only if there is
more than one insertion
2013-05-26 19:57:03 +02:00
nojhan
29c9820786
Fix #147 : propose a font for the analog clock
...
Thanks to Asenar for the tip.
2013-05-25 16:38:46 +02:00
Olivier Mengué
ab56219df1
Merge git, git-svn in case..esac
2013-05-23 00:23:56 +02:00
Olivier Mengué
ad3a979614
Optimize LP_ERR: inline _lp_return_value
2013-05-22 23:56:50 +02:00
Olivier Mengué
56cef06883
Optimize _lp_svn_branch
2013-05-22 23:42:55 +02:00
nojhan
73599b07e9
Merge pull request #187 from jaesivsm/enhance/temp
...
Enhance/temp
2013-05-22 12:02:43 -07:00
nojhan
6ef3fd0c9d
Merge pull request #186 from milouse/develop
...
Display changes in fossil repository the same way as for git
2013-05-22 11:54:05 -07:00
nojhan
7b8413763a
Merge branch 'develop' of https://github.com/jaesivsm/liquidprompt into jaesivsm-develop
...
Conflicts:
liquidprompt
2013-05-22 20:45:56 +02:00
nojhan
e10595144a
Merge pull request #183 from dolmen/optimize/git
...
More Git optimizations
2013-05-22 11:39:32 -07:00
nojhan
9867090c66
Merge pull request #182 from dolmen/fix/lp_escape-usage
...
Fix redundant (and slow): echo $(_lp_escape ...)
2013-05-22 11:38:33 -07:00
nojhan
71466d8636
Merge pull request #181 from dolmen/optimize/_lp_are_vcs_disabled
...
Optimize _lp_are_vcs_disabled
2013-05-22 11:38:07 -07:00
nojhan
1b7c927b97
Merge pull request #180 from dolmen/fix/doc
...
README: fix typos
2013-05-22 11:37:37 -07:00