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

342 Commits

Author SHA1 Message Date
Olivier Mengué
0c1e66d12a git: optimize changed lines extraction 
- use "git diff --shortstat" to replace 3 different calls to "git diff"
- drop usage of awk
 2013-05-15 00:36:02 +02:00
Olivier Mengué
6b6e511387 git: litle optimisation (do not concat $end everywhere) 2013-05-15 00:28:32 +02:00
Olivier Mengué
e7ae332fc8 Optimize _lp_load_color 2013-05-14 22:16:26 +02:00
Olivier Mengué
ea1c897aef _lp_color_map: rename 'load' to 'value' 2013-05-14 22:16:26 +02:00
Olivier Mengué
43511f6f15 _lp_color_map: use dichotomy to more evenly distribute cost 2013-05-14 22:16:26 +02:00
Olivier Mengué
b50970f634 Optimize _lp_color_map using arithmetic comparisons 2013-05-14 22:16:25 +02:00
Olivier Mengué
b3ca6fcdaa Fix _lp_battery return value when LP_ENABLE_BATT != 1 2013-05-14 22:16:25 +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
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
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
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
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
polyphemus
9221d0916c tmux support. Cleanup of _lp_jobcount_color. Adds number of screens sessions and number of tmux sessions as a total of detached sessions. 2013-03-14 22:41:09 +01:00
Brad Beyenhof
fc5da29acb Handle remote sessions that have changed user 
Previously, if you were connected via SSH but had changed user with
su/sudo, the _lp_connection function would report you as being connected
via telnet. Now, if the parent process of your shell is 'su' or 'sudo',
it sets the hostname to the color LP_COLOR_SU (default: bold yellow).

This is probably only useful for people who have installed liquidprompt
in a global location and run it with a globally-accessible shell config
(/etc/profile or similar). But since there's already code to handle a
current user of 'root', I assume this has already happened.
 2013-03-14 10:15:55 -07:00
Luc Didry
9b9191823f Resolving Issue #115 2013-03-14 08:33:21 +01:00
Nicolas LACOURTE
ac92772061 No title for linux console 2013-03-13 23:37:43 +01:00
Nicolas LACOURTE
8b17356596 Add git submodule support 2013-03-13 23:36:15 +01:00
nojhan
4f036f1f0c Merge branch 'master' of https://github.com/LeStef/liquidprompt into develop 2013-03-13 23:01:19 +01:00
nojhan
2869cbaeb4 Test SVN root + temporary remove of result escape 
Now use a direct echo instead of an escaped string, should be fixed.
 2013-03-13 22:49:23 +01:00
Stéphane Pajot
a00944c490 Add some Mercurial informations : nb of lines inserted, deleted and nb of changes to commit 2013-03-13 18:31:26 +01:00
nojhan
8beba7babe Handle cases where git has no upstream with default locals 2013-03-13 16:09:46 +01:00
nojhan
92bd933905 Escape strings that may comes from remote sources 
Use printf "%q" to escape branch names.
 2013-03-13 15:58:56 +01:00
nojhan
b7ffd46f9b Add LP_PERCENTS_ALWAYS, can hide numeric values 
Do you want to display the percentages of load/batteries along with their
corresponding marks? Set to 0 to only print the colored marks.
Defaults to 1 (display percentages)
 2013-03-13 12:30:41 +01:00
nojhan
5aa1484f05 More authors, sorted 2013-03-13 12:14:48 +01:00
nojhan
bb992127ee bugfix: do not try to source if there is no file 2013-03-12 22:14:09 +01:00
nojhan
036847f5b3 Merge branch 'master' into develop 
Conflicts:
	liquidprompt
 2013-03-12 21:59:06 +01:00
nojhan
3aee03d3bb Merge branch 'ps1' of https://github.com/ldidry/liquidprompt into develop 2013-03-12 21:50:07 +01:00
nojhan
38b041de06 Merge branch 'fix-git-integration' of https://github.com/jonasb/liquidprompt into develop 2013-03-12 21:43:35 +01:00
Luc Didry
48743da6e3 Fix custom.ps1 sourcing 2013-03-12 21:02:28 +01:00
Jonas Bengtsson
6da70cc63d git: check the correct remote branch for has_commit 
Previously it was always checking against origin/$branch, but the
remote branch can have any name and the remote branch can also have
any name.
 2013-03-12 20:51:22 +01:00
Jonas Bengtsson
e8649fc440 git: Add support for detached head state 2013-03-12 20:47:52 +01:00
Luc Didry
d8d7e28be3 Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature 
Same problem as #107, same solution ;)
 2013-03-12 20:33:25 +01:00
Luc Didry
22cf1aaafb Issue #108 - Zsh:error in git dir if there is new files 
It was a problem with local declaration and assignation in the same
time. Don't ask me why zsh complains, but it did.
Also, I took the liberty to make a similar change en bzr part, just a
precaution.
 2013-03-12 20:15:13 +01:00
nojhan
0ee5944f79 Differents colors for differents hosts you SSH in 
Adds the LP_ENABLE_SSH_COLORS option to use a numeric hash of the hostname as the displayed color.
 2013-03-12 00:02:04 +01:00
nojhan
3d711323d5 Replace lptag by prompt_tag 
prompt_tag is more consistent with the other prompt_* functions.
 2013-03-11 23:05:10 +01:00
nojhan
9a1e779d11 bugfix #107: zsh-compatible if statement 
An if statement was used without the conditional operator: if [[ "" ]]
This patch adds one: if [[ ! -z "" ]]
Making the code zsh compatible.
 2013-03-11 22:26:49 +01:00
Johann Dreo
d4d5a9f1d1 Revert "avoid replacing "/home/user-alt" by "~-alt"" 
Doesn't work in home folder as $HOME and $PWD don't have any trailing "/".
This reverts commit 4a64c6ccec.
 2013-03-08 14:07:54 +01:00
Nicolas LACOURTE
c5e642a09f Add more generic test for screen/byobu/tmux title 2013-03-08 12:05:42 +01:00