nojhan
9b4f27a938
Merge pull request #88 from dolmen/fix/git
...
More efficient git parsing (2)
2013-01-10 01:56:41 -08:00
Olivier Mengué
d4f41d5a88
_lp_git_branch: faster (less external programs calls)
2013-01-09 18:41:32 +01:00
Olivier Mengué
e7cdc7f9fe
git: fix variable leaks
2013-01-09 18:41:31 +01:00
nojhan
9685323d6a
Merge pull request #87 from dolmen/fix/batt
...
Optimize _lp_battery: no sed
2013-01-09 00:03:21 -08:00
Olivier Mengué
17750477e4
Optimize _lp_battery: no sed
2013-01-09 00:50:03 +01:00
nojhan
947781bac9
Default prefix put a classical prompt as title
...
Update the doc and themes accordingly
2013-01-04 14:08:26 +01:00
nojhan
af43ec0eac
Merge branch 'ps1-prefix' of https://github.com/dr4Ke/liquidprompt into develop
2013-01-04 13:54:48 +01:00
Christophe Drevet
07e177ef70
added a CUSTOMIZING THE PROMPT section
2013-01-04 13:08:36 +01:00
Christophe Drevet
db313ba89e
LP_PS1_PREFIX used to add arbitrary prompt before anything else
2013-01-04 13:01:06 +01:00
Christophe Drevet
a50b988f59
LP_ENABLE_VCS_ROOT to enable use of VCS features with root
2013-01-04 12:13:00 +01:00
Christophe Drevet
d6c5f3ca0f
don't process VCS function if root
...
they do not appear in the result anyway, and they can be quite slow
2013-01-04 12:08:06 +01:00
nojhan
1bf7fd93a5
Merge branch 'fix_git_basename' of https://github.com/dr4Ke/liquidprompt into develop
...
Conflicts:
liquidprompt
2013-01-04 11:24:49 +01:00
nojhan
0ac4e6b4f9
Merge branch 'master' of https://github.com/jorisv/liquidprompt into develop
2013-01-04 11:21:51 +01:00
nojhan
0375431bf2
fix issue #74 by adding an example bashrc
2013-01-04 11:16:44 +01:00
nojhan
45cdcdba0a
move virtual env function in the path section, move the display from the front to the path section of the prompt, inside brackets, add flepied as an author, update the readme
2013-01-03 16:44:15 +01:00
nojhan
cb598c1cb8
Merge branch 'master' of https://github.com/flepied/liquidprompt into develop
2013-01-03 16:30:06 +01:00
Joris Vaillant
f70548525a
Fix a bug in line jump in git directory.
2012-12-06 14:22:43 +01:00
Christophe Drevet
337c473f6a
fix git in a directory containing spaces
2012-12-06 13:38:37 +01:00
Frederic Lepied
0a6d4960f3
added support for python virtualenv
2012-11-03 22:09:50 +01:00
nojhan
452ef223ce
Better default host colorscheme
...
Add two color for the X11 support, green (support) and yellow (no support, not
set in red, because it is not a critical warning). The bold cyan of the hostname
was to close to the green of the colon and the @, change it to blue.
2012-09-25 21:13:08 +02:00
nojhan
5794c3aeac
Feature: blue @ when connected with X11 support
...
If the current connection supports X (if we are in a X session or if we have
enabled X11 forwarding under ssh), the @ displayed in front of the hostname
is colored in blue (use LP_COLOR_X11 to change the color).
2012-09-23 23:07:51 +02:00
nojhan
6db36ab573
add an example of sourcing theme and ps1 config
2012-09-23 22:40:12 +02:00
nojhan
0efdd9da71
clean chroot patch: add chroot for every connexions, modern test, local variabls
2012-09-09 22:43:10 +02:00
nojhan
23f31f952e
Merge branch 'master' of https://github.com/LudovicRousseau/liquidprompt into develop
2012-09-09 22:32:32 +02:00
nojhan
7e4feadb0e
manual merge
2012-09-09 22:25:02 +02:00
Ludovic Rousseau
d870fc4742
Remove extra new line in case of SVN directory
...
Without the patch my prompt is (on 3 lines):
[rousseau:~/Documents/sc/nfc/libnfc]
svn ‡
With the patch my prompt is (on 1 line only):
[rousseau:~/Documents/sc/nfc/libnfc] svn ‡
This is because expr(1) adds a new line at the end of the result.
2012-09-08 15:59:05 +02:00
Ludovic Rousseau
b78882a944
Merge remote branch 'upstream/master'
2012-09-07 17:45:06 +02:00
nojhan
871c38096d
bugfix: consider every X screen as a local connection, not only the first one
2012-09-05 19:44:53 +02:00
nojhan
4ca0203a28
Merge branch 'develop'
2012-09-05 19:39:46 +02:00
nojhan
8affd96f6b
Merge pull request #68 from ldidry/issue63
...
Fixed #63 -- Better fix, and fixed a path repetition problem.
2012-08-28 12:49:15 -07:00
Ludovic Rousseau
fe4f98349e
Add support of /etc/debian_chroot
...
Debian uses the file /etc/debian_chroot to give a name to a chroot.
The default /etc/bash.bashrc contains:
if [ -z "${debian_chroot:-}" ] && [ -r /etc/debian_chroot ]; then
debian_chroot=$(cat /etc/debian_chroot)
fi
PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
2012-08-27 11:45:04 +02:00
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
nojhan
d964ac6d8c
Merge pull request #67 from LudovicRousseau/master
...
Update comment for Colors declarations
2012-08-21 14:53:47 -07: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 2a833475bc
2012-08-21 23:49:55 +02:00
nojhan
e7244c6a43
Merge pull request #66 from LudovicRousseau/master
...
Fix regression: Fails on Mac OS X (again): tput: unknown terminfo capability 'AF'
2012-08-21 14:39:46 -07: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
nojhan
7c16440b22
Merge pull request #59 from dolmen/fix/revert-in-eec91d1d
...
Fix a regression in eec94d1d
by reapplying 7f2ed35c
(correct MARK variable names)
2012-08-21 12:50:43 -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 2a483f9430
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