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
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
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
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
Dustin Knie
3773188b4f
Use print -P instead of echo for printing %~.
2013-04-29 21:04:53 -07: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
nojhan
322d4e846d
Merge branch 'logged-in-user-fix' of https://github.com/jab416171/liquidprompt into develop
2013-04-22 18:13:11 +02:00
nojhan
16d4014a2e
bugfix analog time with a correct and faster implementation
2013-04-22 00:07:45 +02:00
cyli
ffa3e894bc
Allow setting the color on the virtualenv display
2013-04-21 14:17:30 -07:00
Joseph Bass
9c95ac472e
Fixing an issue where logname might not return the right value, but
...
$LOGNAME does
2013-04-21 11:02:42 -06:00
François Schmidts
454dfddd44
implementing a temp monitoring solution
2013-04-21 16:16:06 +02:00
nojhan
f483697fda
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
2013-04-20 21:53:09 +02:00
nojhan
91959b636a
Add an analog clock
...
Using `LP_TIME_ANALOG`, you can now display an analog clock instead of
numeric values. The analog clock is "accurate" to the nearest half hour.
2013-04-20 21:51:55 +02:00
nojhan
86fc212656
Merge pull request #136 from jaesivsm/issue/135
...
Issue/135 — default prompt mark
2013-04-19 08:55:07 -07:00
François Schmidts
2b9d9c7aae
implementing default prompt mark
...
as described in issue #135
2013-04-17 14:12:17 +02:00
François Schmidts
289782f350
fixing issue #132
...
forcing a certain value for IFS in _lp_load_color
2013-04-12 14:46:17 +02:00
nojhan
42af71d3f1
Merge branch 'master' of https://github.com/alexprengere/liquidprompt into develop
2013-04-11 21:32:19 +02:00
Alex
ca41823cdb
Update mail for contributor in comments
2013-04-10 00:55:24 +02:00
Étienne Deparis
4a25d9d236
Fix bug in fossil branch management
2013-03-25 20:57:46 +01:00
nojhan
256191c11b
Merge branch 'develop'
2013-03-25 20:14:24 +01:00
Luc Didry
a1db31b7e3
Fix bad regex for submodule from #118
...
The regex in bash and zsh doesn't need to be quoted. It resulted a
bad regex warning in zsh (#127 ) and it didn't worked in submodule.
Plus, bash and zsh regexes have perlish syntax.
2013-03-25 19:40:04 +01:00
Jean-Sebastien Leroy
9e53b9a0a7
Add shortened path mark user configuration
2013-03-21 21:22:20 +01:00
Johann Dreo
0b0398015b
bugfix: display git-svn branches
2013-03-20 14:02:09 +01:00
Johann Dreo
ff58dac980
Merge branch 'develop' of github.com:nojhan/liquidprompt into develop
2013-03-20 13:59:11 +01:00
Johann Dreo
79e51ded84
Use a double mark for git-svn repos
...
If the current git repository is a git-svn one (if it has a .git/svn
directory), use ±‡ as a prompt instead of just ±.
2013-03-20 13:56:44 +01:00
nojhan
59ac71a2b9
Merge pull request #120 from augmentedfourth/sucheck
...
Handle remote sessions that have changed user
2013-03-16 00:52:44 -07:00
nojhan
3fc566b3a3
Merge pull request #123 from polyphemus/tmux
...
tmux sessions support
2013-03-15 12:11:33 -07:00
nojhan
d1c7c9d394
Merge pull request #121 from ldidry/115
...
Resolving Issue #115
2013-03-15 12:06:00 -07:00
polyphemus
ecfdc47a8d
Only match detached tmux sessions, not all.
2013-03-14 22:58:27 +01:00