Commit Graph

232 Commits

Author SHA1 Message Date
Olivier Mengué
c9f85763a6 Unset _lp_source_config once done 2012-08-21 08:21:41 +02:00
Olivier Mengué
f8b2194fa2 Cleanup _lp_source_config: remove _lp_ prefix from locals
Now that color definition utilities (_lp_ti_*) variables and functions
are "local" we do not fear to override someting defined by the user.
So just rename to shorter and cleaner names without the _lp_ prefix.
2012-08-21 07:54:54 +02:00
Olivier Mengué
c0d023b4ad More comments 2012-08-21 07:51:40 +02:00
Olivier Mengué
a673a2e9fd Refactor config loading: step 6
Move the 'local' keyword in front of where each color variable
is defined, for safer maintenance.
2012-08-21 07:40:02 +02:00
Olivier Mengué
92384caac9 Refactor config loading: step 5 (indent)
Just indenting lines in _lp_source_config after the move.
2012-08-21 07:22:21 +02:00
Olivier Mengué
5ee2b74f10 Refactor config loading: step 4
Move colors definitions inside _lp_source_config.
(The important part of the diff is that the beginning of the
_lp_source_config function is moving up).
2012-08-21 07:17:10 +02:00
Olivier Mengué
35cc6109fd Refactor config loading: step 3 (indent)
Indent (separate commit just for readability of the step).
2012-08-21 07:07:34 +02:00
Olivier Mengué
29c5d217c7 Refactor config loading: step 2
Default settings are now set inside the _lp_source_config function
2012-08-21 07:06:02 +02:00
Olivier Mengué
15fbf26076 Refactor config loading: step 1 2012-08-21 07:03:52 +02:00
Olivier Mengué
0cfcbac7c7 Refactor color definition ; Cleanup colors once config is loaded
Now use TermInfo feature detection instead of just distinguishing if
"$OS == FreeBSD". This will allow support for more terminal definitions.

Cleanup color variables (BLACK, WHITE, BLUE, BOLD...) once the config
file has been loaded as color variables are not used at runtime.
2012-08-17 18:51:21 +02:00
nojhan
05defce9d2 liquidize the time feature 2012-08-17 16:31:45 +02:00
nojhan
b7459e1db8 Merge pull request #56 from ojdupuis/master
Add support for time
2012-08-17 07:21:14 -07:00
nojhan
5e152f7034 test enabling feature 2012-08-17 16:16:35 +02:00
nojhan
6a2ac56b89 more tests, print line nb in fail 2012-08-17 15:59:32 +02:00
Olivier
eec94d1db8 Add support for time 2012-08-17 15:47:44 +02:00
nojhan
b504bbc96b fix fake git diff for testing changes 2012-08-17 15:00:23 +02:00
nojhan
320adbd37b set test config after loading 2012-08-17 12:29:13 +02:00
nojhan
b488a1cda1 better test output formatting 2012-08-17 12:23:36 +02:00
nojhan
7f2ed35c41 missing rename of mark variable for battery 2012-08-17 12:04:04 +02:00
nojhan
fd62c9d5b1 separated tests for battery mark and level 2012-08-17 12:03:38 +02:00
nojhan
7afc296bc9 basic features assertion 2012-08-17 12:01:01 +02:00
nojhan
733522d2c7 Merge branch 'master' of https://github.com/nojhan/liquidprompt 2012-08-16 23:22:08 +02:00
nojhan
0692501ad1 correct proxy mark 2012-08-16 20:54:16 +02:00
nojhan
9051f3fb70 rename _lp_set_bash_prompt as _lp_set_prompt 2012-08-16 20:18:29 +02:00
nojhan
861f7c382d Add the screenshot to the readme 2012-08-16 20:47:41 +03:00
nojhan
0e7d3bf2b8 Merge pull request #55 from dolmen/fix/unify-LP_ENABLE-style
Unify style of LP_ENABLE_ variable handling
2012-08-16 10:40:17 -07:00
nojhan
ed9f655ad2 Merge pull request #54 from jaesivsm/develop
fix mark
2012-08-16 10:38:22 -07:00
Olivier Mengué
a4a6cf3008 Unify style of LP_ENABLE_ variable handling
See commit 7d4ca77009 for a rationale.
2012-08-16 18:35:07 +02:00
François Schmidts
7ee027e243 fix mark
in recent vars renaming we lost the custom mark
2012-08-16 17:56:36 +02:00
nojhan
39ba4c33f1 Add conditionnal enabling for the battery meter
Early detection when `acpi` is missing.
Update the README.
2012-08-16 17:10:58 +02:00
nojhan
b48a0cc8fc manual merge 2012-08-16 17:04:36 +02:00
Olivier Mengué
b52cb624bc Detect SCM tool presence just once
For git/svn/hg, the tool presence in $PATH is detected just once at init
time (instead of at runtime, at every prompt display) and the LP_ENABLE_
variable is set to false if it is missing.
2012-08-16 16:39:20 +02:00
Olivier Mengué
7d4ca77009 The only true value is 1, everything else is false
For boolean variables (there is no such type in shell) we consider
that '1' is true, and everything else ('0', ''...) is false.
So all tests are now done by comparing the "one true value", '1', and
variables expansion is protected with quotes.
Affects LP_ENABLE_*, LP_HOSTNAME_ALWAYS.
2012-08-16 16:31:00 +02:00
Olivier Mengué
4b42dffb66 Fix return followed by '""'
@ldidry Shell functions return only an error code.
2012-08-16 16:16:51 +02:00
nojhan
af629fe960 rename LP_UNTRACKED to LP_MARK_UNTRACKED 2012-08-16 15:51:01 +02:00
nojhan
38c4362836 Add enable parameters for all features
Merge branch 'disable_vcs' of ssh://localhost:8480/ldidry/liquidprompt into develop
If permissions are not enabled, echo a uncolored colon.
2012-08-16 15:34:03 +02:00
nojhan
a3be8d3465 More consistent special chars variable names
Basically rename LP_*_MARK to LP_MARK_* and list them in the README.
2012-08-16 15:22:01 +02:00
Luc Didry
05fcbe909a Allow to disable load, battery, etc. in the rc file
Yes, much more config options, but it allows to lighten the prompt and
so improve its speed. I wanted to detect the useful parts by parsing the
theme but it seems impossible (I didn't find how).
2012-08-16 15:16:48 +02:00
nojhan
991b2b38be add configurable untracked changes mark, at a better position 2012-08-16 14:28:55 +02:00
nojhan
822b20eec6 Merge ssh://localhost:8480/alexprengere/liquidprompt into develop 2012-08-16 14:16:31 +02:00
Alex
34c8d901ce Changed default zsh prompt mark from $ to % 2012-08-16 14:11:52 +02:00
Alex
3046024b29 Adding git untracked files information (branch* instead of branch if so) 2012-08-16 14:08:07 +02:00
nojhan
309ccd86fd Merge ssh://localhost:8480/jaesivsm/liquidprompt into develop 2012-08-16 13:42:39 +02:00
François Schmidts
72b4001a41 fix for issue #44 2012-08-16 13:07:32 +02:00
nojhan
170628b676 Separate templates from themes
This add colors to features in the main code, so as to avoid having to specify
them in the template part. LP_PS1 is thus easier to set, with just a list of
features to activate along with basic characters.
2012-08-16 12:13:40 +02:00
Luc Didry
71c9b6ddb8 Update README : the theme must be sourced *before* LP 2012-08-16 11:21:14 +02:00
Luc Didry
2774c8fc37 Bugfix : No more yellow color while being root 2012-08-16 11:18:17 +02:00
nojhan
a2af9a0b4a Merge branch 'disable_vcs' of ssh://localhost:8480/ldidry/liquidprompt into develop 2012-08-16 11:17:12 +02:00
Luc Didry
4b1f4646de Use short name (MERCURIAL => HG) for variable LP_ENABLE_MERCURIAL 2012-08-16 10:40:20 +02:00
Olivier Mengué
9feb14caa5 Fix _lp_CPUNUM on Linux when 'nproc' is missing
On Linux, hide the "command not found" message on Linux when 'nproc'
is missing and the grep fallback is used.
(nproc doesn't exist on Debian Lenny, see issue #31 and #36)
2012-08-16 00:25:58 +02:00