Luc Didry
109a4e08f8
Fixed #63 -- Better fix, and fixed a path repetition problem.
...
Fix little error
2012-08-24 14:09:18 +02:00
Luc Didry
fbaac8fa8e
Fixed #63 -- Better fix, and fixed a path repetition problem.
2012-08-24 13:54:43 +02:00
Ludovic Rousseau
b9e020cb19
Fix Darwnin _lp_cpu_load()
...
With the previous code I get an error before each prompt:
-bash: $/dev/fd/62: No such file or directory
Maybe the same code can't be used for both Darwnin and FreeBSD.
I reuse the code removed in 2a833475bc6661a59b5eecc4f8aa343f4bb1977b
2012-08-21 23:49:55 +02:00
Ludovic Rousseau
5ebf982ceb
Update comment for Colors declarations
...
Make it more explicit that the default case is not only for Linux but
also for SunOS and Darwin.
Darwin case can not be merged with FreeBSD.
2012-08-21 23:39:46 +02:00
Ludovic Rousseau
8192ed9a84
Darwin is NOT FreeBSD
...
The Colors declarations for Darwin should use the Linux method and NOT
the FreeBSD method or you get errors:
tput: unknown terminfo capability 'AF'
2012-08-21 23:35:14 +02:00
nojhan
1ca2808ffd
Merge https://github.com/flepied/liquidprompt
2012-08-21 23:01:01 +02:00
nojhan
4b5d703c73
manual merge
2012-08-21 22:39:07 +02:00
nojhan
bf9b895392
Merge branch 'refactor/terminfo-sh' of https://github.com/dolmen/liquidprompt into develop
2012-08-21 22:35:57 +02:00
nojhan
e0b1c14ff0
Merge pull request #65 from LudovicRousseau/master
...
Use BOLD instead of BOLD_WHITE as default color for PATH
2012-08-21 13:21:50 -07:00
nojhan
9a87c5b4d5
bugfix #63 : echo path in quotes to avoid problems with spaces
2012-08-21 22:17:37 +02:00
nojhan
2817abd914
do not search the .svn directory (subversion 1.7 compatibility)
2012-08-21 22:03:42 +02:00
nojhan
fc89cbc136
Merge pull request #58 from dolmen/fix/optimize-SCM
...
Optimizations for Subversion and Mercurial
2012-08-21 13:00:28 -07:00
Ludovic Rousseau
a86be2e435
Merge remote-tracking branch 'upstream/master'
2012-08-21 14:01:34 +02:00
Ludovic Rousseau
bd5fab3d29
Set LP_COLOR_MARK default to BOLD no color
...
Same reason as for 2a483f943077a7c680a0a3936d2c5ac33fe6822f
2012-08-21 13:58:35 +02:00
Ludovic Rousseau
2a483f9430
Set LP_COLOR_PATH default to BOLD no color
...
The previous value was BOLD_WHITE but it does not work for black on
white terminal.
Using BOLD instead should work on any configuration.
2012-08-21 17:03:35 +02:00
Olivier Mengué
65b44cd64f
More comments
2012-08-21 12:13:06 +02:00
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
Frederic Lepied
1d3b935bb1
support git bare repositories
2012-08-20 14:36:12 +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
Olivier Mengué
3e00d6cc56
Fix a revert in eec94d1d by reapplying 7f2ed35c
...
In eec94d1db8d2a87b10c1034429f44c00bffc1be8 (which is about the time
feature) it looks like 7f2ed35c414cbb5b34ea50ac8867fa58311ff4fb has
been reverted (probably a merge error). This patch reapplies it.
2012-08-17 18:10:11 +02:00
Olivier Mengué
7ceaebaac9
Faster _lp_hg_branch()
2012-08-17 17:54:54 +02:00
Olivier Mengué
c47b18fb6e
Faster _lp_svn_branch_color
2012-08-17 17:54:54 +02:00
Olivier Mengué
0fb81d5a1c
Faster _lp_svn_branch
2012-08-17 17:54:54 +02:00
nojhan
05defce9d2
liquidize the time feature
2012-08-17 16:31:45 +02:00
Olivier
eec94d1db8
Add support for time
2012-08-17 15:47:44 +02:00
nojhan
7f2ed35c41
missing rename of mark variable for battery
2012-08-17 12:04:04 +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
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
Olivier Mengué
a4a6cf3008
Unify style of LP_ENABLE_ variable handling
...
See commit 7d4ca7700945a74b2c078e75aff9bdf68df23aa0 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
