stonewareslord/lpr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
247 Commits 1 Branch 0 Tags 919 KiB
d870fc4742
Commit Graph

110 Commits

Author SHA1 Message Date
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
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
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
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
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 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
Frederic Lepied
1d3b935bb1 support git bare repositories 2012-08-20 14:36:12 +02:00
Olivier Mengué
3e00d6cc56 Fix a revert in eec94d1d by reapplying 7f2ed35c 
In eec94d1db8 (which is about the time
feature) it looks like 7f2ed35c41 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 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
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
Luc Didry
36954546d7 Allow to disable git/svn/mercurial features 
New variables in liquidpromptrc for that
 2012-08-15 11:45:02 +02:00