Commit Graph

491 Commits

Author SHA1 Message Date
nojhan
af43ec0eac Merge branch 'ps1-prefix' of https://github.com/dr4Ke/liquidprompt into develop 2013-01-04 13:54:48 +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
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
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
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
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 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
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
Olivier Mengué
fc7b317c1f Unset LP_OS for runtime
Now that LP_OS is not used at runtime, unset it at the end of the init.
2012-08-15 00:21:21 +02:00
Olivier Mengué
2a833475bc Refactor CPU load
Use a single function name for collecting loadavg. Reduces pollution
(issue #28).
Refactor _lp_load_color: less code but same features.
2012-08-15 00:11:34 +02:00
Olivier Mengué
7f5346f953 Refactor _lp_CPUNUM 2012-08-14 23:24:55 +02:00
Olivier Mengué
1f21d7ff5e Refactor OS detection
Darwin is merged with FreeBSD as all Darwin implementation are already
delegating to FreeBSD implementations.
2012-08-14 23:10:49 +02:00
nojhan
78b9aff683 config notab everywhere 2012-08-14 15:59:36 +02:00
nojhan
7693c0394c bugfix: local connection if session is :0 but not :0.0 2012-08-14 15:55:23 +02:00
nojhan
a4ec9a4d72 Merge branch 'feature/optimize-LP_HOST' of ssh://localhost:8480/dolmen/liquidprompt 2012-08-14 15:50:06 +02:00
nojhan
c90f31351c add examples an explanations on how to make themes 2012-08-14 15:38:33 +02:00
Olivier Mengué
24858a4fdd Fix tabs 2012-08-14 15:11:48 +02:00
nojhan
660bc29d8c add configurable colormaps 2012-08-14 15:06:58 +02:00
Olivier Mengué
413fc068c7 Add myself as contributor 2012-08-14 14:41:23 +02:00
nojhan
36fd1c8f52 color themes for VCS and battery marks 2012-08-14 14:35:20 +02:00
Olivier Mengué
c9d43a52fa Optimize LP_HOST
Simplify _lp_connection (code reduced by 70%, much less external
programs used).
Call _lp_connection just once at init time.
Inline _lp_host_color.
LP_HOST is now a global defined just once.
2012-08-14 14:33:30 +02:00
nojhan
8e3d2fe0c8 remove tabs and change readme title 2012-08-14 14:12:33 +02:00
nojhan
aa0f725b99 Merge pull request #36 from jaesivsm/master
Reverting nproc adding
2012-08-14 03:20:06 -07:00
nojhan
9f06ebe883 Merge pull request #35 from dolmen/fix/WORKING_SHELL
Fix shell detection
2012-08-14 03:18:53 -07:00
nojhan
cd77001459 remove deprecated LP_REVERSE 2012-08-14 12:16:48 +02:00
François Schmidts
6d45328d02 Revert "nproc is slightly faster than grep on my machine"
This reverts commit 3abc3999dd.

Conserving retro compatibility with lenny.
2012-08-14 12:11:44 +02:00
nojhan
a7870b966b default theme colors 2012-08-14 12:09:11 +02:00
Olivier Mengué
522c7208fe Fix shell detection
Faster detection based only on BASH_VERSION/ZSH_VERSION variables.
Fixes shell detection (sub shell detection broken in 7e8fc0e).
Should better fail when started with an other shell than bash/zsh.
2012-08-14 12:08:43 +02:00
nojhan
7b4c68f919 Colors themes for most of the propmt parts
Set of parameters to change the colors, VCS still not themable.
2012-08-14 12:01:14 +02:00
Ludovic Rousseau
5c7c50e6ea Remove declaration of LP_REVERSE
LP_REVERSE use has been removed in commit
21808bb5e2
2012-08-14 11:48:44 +02:00
nojhan
6b5111d8f5 Config files sourcing order
Always source /etc config file if it exists, before home ones.
Source config after colors declarations, to prepare theme management.
2012-08-14 11:10:12 +02:00
nojhan
5ad9e1c5dc bring back B&W colors, alt user in bold 2012-08-14 10:56:34 +02:00
nojhan
82ee96a63a Merge pull request #31 from jaesivsm/master
Bugfix _LP_OPEN_ESC, use nproc, prepare themes
2012-08-14 01:52:12 -07:00
Poil
6bffd34543 bugfix tty grab 2012-08-14 10:36:36 +02:00
François Schmidts
21808bb5e2 trusting default shell colors
supressing config option in configuration file
2012-08-14 00:56:27 +02:00
François Schmidts
3abc3999dd nproc is slightly faster than grep on my machine
could improve overall performance, plus nproc belong to coreutils, so it
should be pretty common
2012-08-14 00:42:08 +02:00
François Schmidts
a15f104fa8 fixing redefinition of var _LP_OPEN_ESC
the color tag wern't closed with bash
2012-08-14 00:37:36 +02:00
nojhan
0125ee0cef manual merge 2012-08-13 23:17:45 +02:00
nojhan
7b8ba5e7f9 fix #26 : prefix with _lp_ or LP_ and local variables 2012-08-13 23:15:24 +02:00
Luc Didry
34826d0353 Fix bug : forgot to change a 'bash' into ${WORKING_SHELL} 2012-08-13 23:07:58 +02:00
Poil
6f0bf08f61 faster TTY grab 2012-08-13 22:43:13 +02:00
nojhan
3b6d8c8e68 typo bad merge 2012-08-13 22:41:57 +02:00
nojhan
b882e1550e merge shell grab and mac shell 2012-08-13 22:37:27 +02:00
nojhan
9fb2965c4b adapter mark default set 2012-08-13 22:28:50 +02:00
nojhan
956ed8717c Merge branch 'master' of https://github.com/nojhan/liquidprompt 2012-08-13 22:24:19 +02:00
nojhan
45fddb4517 feature #25 : unicode chars only for utf-8 charset, else latin 2012-08-13 22:23:43 +02:00
Luc Didry
0d0f8f108d Update comments 2012-08-13 22:09:49 +02:00
Poil
09d6ff48a7 Other improvment 2012-08-13 21:01:33 +02:00
Poil
7e8fc0e01f New shell detection 2012-08-13 20:47:29 +02:00
Poil
5db1507b96 Small improvement 2012-08-13 20:40:36 +02:00
Luc Didry
32a89f5b90 Update vim modeline since there is no more shebang
Without shebang, vim doesn't know the filetype => syntaxic color off
2012-08-13 20:20:18 +02:00
Ludovic Rousseau
86f8dba07f A login shell starts with a "-"
A login shell process is started with a "-" as the first character in
the process name. It is the case with Terminal on Mac OS X.

See http://docstore.mik.ua/orelly/unix/upt/ch51_09.htm
2012-08-13 16:37:56 +02:00
Ludovic Rousseau
0818aa1869 Warn if the shell is not supported
If the shell is not recognised as a supported ("bash" and "zsh" for now)
then a warning will be displayed in red.

For example on Mac OS X the shell process is named "-bash" (note the
first character) and is not yet recognised as a valid shell name.
2012-08-13 16:37:49 +02:00
Luc Didry
4c023a2a94 Fix bug: __battery:local:3: not an identifier: 0: 2012-08-13 16:34:02 +02:00
Luc Didry
c2fdb1751e Fix bug in load printing (% not escaped in zsh)
Same thing than c8f01e68a3
2012-08-13 15:20:20 +02:00
Luc Didry
e9099d15a3 Allow to have a /etc/liquidpromptrc
Permit to have a modified configuration base for all users
2012-08-13 14:30:54 +02:00
Luc Didry
39fc1df488 Smaller shell detection (Thx to Michel Barret) 2012-08-13 11:44:09 +02:00
Luc Didry
a11b838116 Change charging battery symbol and color 2012-08-13 10:02:10 +02:00
Luc Didry
9a33acef08 Fix bug: __battery:local:3: not an identifier: 0: 2012-08-13 09:27:14 +02:00
nojhan
1243987b80 Merge https://github.com/ldidry/liquidprompt 2012-08-12 12:16:10 +02:00
nojhan
508b218004 Indicate if the battery is (dis)charging
Displays:
* a green ⌁ if the battery is charging and above a given threshold,
* a yellow ⌁ if the battery is charging and under threshold,
* a red ⌁ if the battery is discharging but above threshold;
2012-08-12 12:13:47 +02:00
Luc Didry
e754319c9c Fix bug : shorten path didn't work anymore
Stupido ! How can I have the length of $p before
its attribution ? Shame on me.
2012-08-12 11:18:18 +02:00
Luc Didry
f7de6d019b Bug fix : no more path in bash ☹ 2012-08-12 11:02:48 +02:00
Luc Didry
2810d481aa Fix typo and remove trailing space 2012-08-12 10:52:03 +02:00
Luc Didry
fb5860bd26 Fix bug in shorten_path for zsh 2012-08-12 10:51:29 +02:00
Luc Didry
c8f01e68a3 Battery printing bug in zsh part (special character not escaped) 2012-08-12 10:38:52 +02:00
Luc Didry
4e94fa71ff Improvments for zsh shorten_path 2012-08-12 10:08:59 +02:00
Luc Didry
f51d6d21b5 Make liquidprompt bash AND zsh compliant
The script now can be sourced from either bash and zsh
No more shebang and small improvments added too
2012-08-12 00:46:05 +02:00