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

511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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
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