Commit Graph

718 Commits

Author SHA1 Message Date
nojhan
fe6d9f3ebe doc #153: instructions for setting up with zsh 2013-05-14 15:50:47 +02:00
nojhan
1e9036eb57 Merge branch 'fix/IFS' of http://github.com/dolmen/liquidprompt into develop 2013-05-14 15:35:32 +02:00
nojhan
e08e278a7c Merge branch 'fix/_lp_bzr_color' of http://github.com/mainerror/liquidprompt into develop 2013-05-14 15:33:40 +02:00
nojhan
136da693bb Merge branch 'devel' of http://github.com/Cougar/liquidprompt into develop
Conflicts:
	liquidprompt
2013-05-14 15:14:36 +02:00
Olivier Mengué
64c6b7c0f9 Restore LP_ERR as the first instruction of _lp_set_prompt 2013-05-14 09:08:54 +02:00
Olivier Mengué
cf8b8b29bb Local IFS reset to our expected standard value
Revert 289782f350 (broken patch from issue #133) and really fix #132.
2013-05-14 00:36:38 +02:00
Octavian Damiean
8423e9c8a4 Fixed issue #162. Added programm exit value check to _lp_bzr_branch_color to return in case the current directory is not a Bazaar directory. 2013-05-11 01:15:11 +02:00
Cougar
57af36a028 fixing issue #171
Fixes situation when HOME=/root and /any/other/dir/root
will be replaced with /any/other/dir~
2013-05-06 14:02:21 +03:00
nojhan
a963743bbb Merge pull request #155 from jaesivsm/fix/git-rev-list
fix for issue #151"bug in _lp_git_branch_color"
2013-05-05 12:02:36 -07:00
nojhan
197714ff19 Merge pull request #169 from jaesivsm/issue/159
a fix for issue #159
2013-05-05 12:02:10 -07:00
nojhan
fca791a06f Merge pull request #167 from dolmen/optimize/shell-checks
Optimize bash/zsh checks
2013-05-05 11:51:21 -07:00
nojhan
0c580401bf Merge pull request #168 from dolmen/optimize/sr,sl,sb
Optimize _lp_sr, _lp_sl, _lp_sb
2013-05-05 11:50:53 -07:00
Olivier Mengué
cc6c0e8d20 s/if [[ ! -z /if [[ -n / 2013-05-05 00:36:33 +02:00
Olivier Mengué
81bc91d4dc Optimize _lp_sl/sr/sb 2013-05-05 00:34:03 +02:00
Olivier Mengué
b424c62ba8 Optimize bash/zsh checks
Avoid string comparisons. Use instead true/false builtins.
So:
    if [[ $_LP_WORKING_SHELL == bash ]]
becomes:
    if $_LP_SHELL_bash
2013-05-05 00:16:37 +02:00
Olivier Mengué
7e01b1648c _lp_time: fix wrong usage of 'echo -e' 2013-05-04 22:58:12 +02:00
Olivier Mengué
4148a3d9a2 _lp_time_analog: optimize and fix variable leaks 2013-05-04 22:50:49 +02:00
nojhan
1d5e621b1b Update the doc about colored brackets 2013-05-04 17:10:10 +02:00
nojhan
56f4883d8b Merge branch 'fix/multiplexer-brackets' of https://github.com/dolmen/liquidprompt into develop
Conflicts:
	liquidprompt
2013-05-04 17:06:11 +02:00
nojhan
91501581a5 Merge branch 'optimize/shorten_path' of https://github.com/dolmen/liquidprompt into develop
Conflicts:
	liquidprompt
2013-05-04 16:54:00 +02:00
nojhan
7e47557fe0 Merge branch 'zshshortenpathfix' of https://github.com/nullpuppy/liquidprompt into develop 2013-05-04 16:50:14 +02:00
nojhan
1b2211072e Merge branch 'master' of https://github.com/youngking/liquidprompt into develop 2013-05-04 16:46:13 +02:00
nojhan
18dc1edee1 Update the README with the temperature feature 2013-05-04 16:44:16 +02:00
nojhan
5bafff5c3a Move the temperature before the jobs, with other sensors 2013-05-04 16:41:07 +02:00
nojhan
de4c7ea8d2 More the temperature mark before the colored value
Because the θ character may be confused with a 0, which was less readable.
2013-05-04 16:38:55 +02:00
nojhan
6ce373114a Merge branch 'feature/temp' of https://github.com/jaesivsm/liquidprompt into jaesivsm-feature/temp
Add the temperature threshold in the RC file

Conflicts:
	liquidpromptrc-dist
2013-05-04 16:30:45 +02:00
nojhan
de78b8288e Merge branch 'optimize-http_proxy' of https://github.com/dolmen/liquidprompt into develop 2013-05-04 16:21:47 +02:00
nojhan
9d6f3007c4 Merge branch 'master' of https://github.com/jpec/liquidprompt into develop 2013-05-04 16:07:56 +02:00
nojhan
293c3d637f bugfix: do not increase the bracket colors when sourcing 2013-05-04 16:04:51 +02:00
Olivier Mengué
2aaf7bb002 Major fix for brackets in terminal multiplexer
Optimize terminal multiplexer detection by moving it to the initial
loading instead of at each prompt display: the terminal multiplexer is
always a parent process and that can not change during the shell life.

This also fixes a major leak: LP_MARK_BRACKET_OPEN was growing at each
prompt display when running in a terminal multiplexer.
(check with: echo "$LP_MARK_BRACKET_OP" | od -c )
2013-05-04 15:15:26 +02:00
Olivier Mengué
9daaaa9f4f Optimize _lp_in_multiplexer
Use the return code of the function to return the value instead of
stdout.
2013-05-04 15:07:51 +02:00
Olivier Mengué
bfeaffdc3b Optimize _lp_shorten_path by using bash/zsh features
Optimizations:
- move variable declaration in blocks where they will be used
  (so they are not computed in blocks where they are not used)
- "local -i" for integer variables
- if [[ $(( ... )) -gt $(( ... )) ]]   ==>  if (( ... > ... ))
- i=$((i+1))   ==>  let i++
As a side effect the readability of the code is improved.
2013-05-04 14:41:38 +02:00
François Schmidts
32b7bc04e5 fixing a bug in the execution of git rev-list 2013-05-04 13:55:07 +02:00
François Schmidts
75c346feb4 add commentaries and a selection process for temperature source
* add a function selection process at loading time so liquidprompt can use other command than sensors to get temperature
* add commentaries
2013-05-04 09:58:37 +02:00
Olivier Mengué
a3afd42ca9 Fix credits 2013-05-03 23:44:27 +02:00
Olivier Mengué
5ead985c8a Optimize _lp_proxy 2013-05-03 23:42:26 +02:00
nojhan
f9e9be43aa Update the doc about the postfix, add an author. 2013-05-03 21:06:08 +02:00
nojhan
e76781d617 Merge https://github.com/f4hy/liquidprompt into develop 2013-05-03 20:59:58 +02:00
François Schmidts
55df57508f propsing a fix for issue #159 2013-04-30 14:03:37 +02:00
Dustin Knie
3773188b4f Use print -P instead of echo for printing %~. 2013-04-29 21:04:53 -07:00
Julien Pecqueur (JPEC)
3083b8fd68 Fix PKGBUILD 2013-04-29 19:04:15 +02:00
YoungKing
ccde12c406 make LP_TITLE works under macos 2013-04-29 00:10:08 +08:00
François Schmidts
e35c90318e prevent the feature from breaking systems that can't run the "sensors" command 2013-04-22 23:32:50 +02:00
François Schmidts
43e426d0e8 add configuration options and temperature mark 2013-04-22 23:22:32 +02:00
Brendan Fahy
4f0a1c9af6 added LP_PS1_POSTFIX 2013-04-22 15:16:56 -04:00
nojhan
554c155afb Merge branch 'git-untracked-dir' of https://github.com/jab416171/liquidprompt into develop 2013-04-22 20:35:35 +02:00
Joseph Bass
0c57f27bba Only show the branch specifier if the current directory is part of a git repo 2013-04-22 11:41:08 -06:00
nojhan
d367976932 Add a special mark when in a disabled VCS repository
This adds the LP_MARK_DISABLED (default: "⌀"), used as a prompt mark
when in disabled repositories (see `LP_DISABLED_VCS_PATH`).
2013-04-22 19:16:31 +02:00
Daniel Miranda
ccd417584a Cygwin lack of 'o' option for ps shows error messages on every prompt
Cygwin doesn't support the 'o' option for ps (version: ps (cygwin) 1.7.17), which causes errors to show on every prompt
displayed. A simple fix is redirecting stderr to /dev/nullin liquidprompt/liquidprompt (it might actually be a good idea
to do the same for other commands, since any kind of undesired output makes the prompt pretty much blow up).
2013-04-22 18:17:01 +02:00
nojhan
f4815f07f0 Merge branch 'master' of https://github.com/cyli/liquidprompt into develop 2013-04-22 18:14:59 +02:00