Commit Graph

114 Commits

Author SHA1 Message Date
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
Michel Barret
b9223d3404 faster load average for SunOS 2012-08-11 11:42:29 +02:00
M.Poil
6cd841ee1f faster proc count 2012-08-11 11:40:39 +02:00
nojhan
74109a5c83 prompt_OFF command to deactivate any prompt 2012-08-11 10:20:37 +02:00
nojhan
bfd9e5c708 + license in the readme 2012-08-10 16:52:23 +02:00
nojhan
c0f3d7bfdd screenshot 2012-08-10 16:48:07 +02:00
nojhan
45bfd4d866 add PS1 forging with liquidprompt function
This adds the possibility to forge a different prompt than the default one, by
laying out liquidprompt features in a different order.
Just build a properly escaped LP_PS1 variable.
2012-08-10 15:46:44 +02:00
nojhan
3e80f5fc29 bugfix support for run/stop jobs combination
The combination of running *and* stopped jobs was not displayed.
Refactor the jobcount function: arguments of conditions is now in the same order
as the display.
2012-08-10 15:08:08 +02:00
nojhan
0943eb67a9 Different prompt mark for different VCS (±, ☿, ‡)
± for git directories, ☿ for mercurial, ‡ for svn.
Thus, do not display the now useless letter prefix before the branch name.
Refactor the smart mark function.
2012-08-10 14:40:50 +02:00
nojhan
8fd5c95409 add dependencies list in the readme 2012-08-10 14:30:13 +02:00
nojhan
40e2db6e71 use d/&/z instead of s/r/t for jobs markers
Those are marks closer to the commands
2012-08-10 14:28:18 +02:00
nojhan
a9d151f9ed TODO prompt mark for mercurial 2012-08-09 21:36:28 +02:00
nojhan
3ba404d106 display an arrow if http_proxy is in use 2012-08-09 12:11:51 +02:00
nojhan
f851d6cf4f update the readme about unicode chars 2012-08-09 12:11:16 +02:00
nojhan
4d0bc5566a Use unicode characters, prefix branches with letter
Prefix branch names with a letter of the VCS (g for git, h for mercurial and s for svn).
Use electric sign ⌁ instead of b for battery.
Use home sign ⌂ instead of l for load.
2012-08-09 11:53:47 +02:00
nojhan
c3c6c9169e Merge pull request #17 from LudovicRousseau/master
Support directory names with white space(s) inside (again)
2012-08-08 01:15:35 -07:00
Ludovic Rousseau
05bbc5f4a8 Merge remote branch 'upstream/master'
Commit 3f0522b was bogus.

Conflicts:
	liquidprompt.bash
2012-08-07 23:53:20 +02:00
Ludovic Rousseau
3eda505a3d Merge remote branch 'upstream/master' 2012-08-07 22:42:16 +02:00
Ludovic Rousseau
a531389c72 Support directory names with white space(s) inside
The patch from ab4ac41 was inadvertently lost in merge a114b8c
2012-08-07 22:36:55 +02:00
Ludovic Rousseau
3f0522b4a0 Support directory names with white space(s) inside
If you "cd ~/Library/Application Support" or any directory containing a
white space then bash will run in an endless loop.

This is because __shorten_path $PWD $PATH_LENGTH is used instead of
__shorten_path "$PWD" $PATH_LENGTH
Note the use of "" around $PWD in the fixed version.

In case of the bug we have in the __shorten_path function
$1 is set to ~/Library/Application
$2 is set to Support
$3 is set to $PATH_LENGTH

With the fix we now have:
$1 set to ~/Library/Application Support
$2 set to $PATH_LENGTH

Conflicts:

	liquidprompt.bash
2012-08-07 21:48:11 +02:00
nojhan
fb814125af bugfix: avoid recurisve prompt command
The bug was occuring when sourcing the liquidprompt a second time while it has
already been set. A set variable is now set to avoid double sourcing.
2012-08-07 21:29:44 +02:00
nojhan
5da885a4ab bugfix: do not try to keep too large path 2012-08-07 21:16:51 +02:00
Thomas DEBESSE
f7e3ad940c simplify max columns number management 2012-08-07 20:59:58 +02:00
nojhan
2c73402a31 config option to always display the hostname
Do you want to display the hostname, even if not connected through network?
Use LP_HOSTNAME_ALWAYS. It defaults to 0 (do not display hostname when localy
connected). Set it to 1 if you want to always see the hostname.
2012-08-07 20:52:32 +02:00
nojhan
6358ca90d3 bugfix a typo in config file name, use modern test 2012-08-07 20:48:27 +02:00
nojhan
24d7549a06 Merge branch 'master' of https://github.com/nojhan/liquidprompt 2012-08-05 22:07:45 +02:00
nojhan
3453546eaa use svn info instead of .svn directories as a svn test, better match regexp 2012-08-05 22:06:54 +02:00
nojhan
c22d6299aa Merge pull request #16 from LudovicRousseau/master
Debug for 1643147
2012-08-05 03:25:46 -07:00
Ludovic Rousseau
5aaca781a2 Debug for 1643147
We need to get the return code _before_ executing the old prompt in
order to not loose the returned value.
2012-08-05 11:19:19 +02:00
nojhan
a6621a1f32 Merge pull request #14 from LudovicRousseau/master
bugfix on PROMPT_COMMAND management
2012-08-05 01:49:44 -07:00
Ludovic Rousseau
16431473c2 Debug for c46f027
PROMPT_COMMAND
  If set, the value is executed as a command prior to issuing each
  primary prompt.

PROMPT_COMMAND cannot contain a script but only ONE command (at least on
bash 3.2.48 from Mac OS X Lion)

The solution is to call the old prompt command at the start of
__set_bash_prompt()
2012-08-05 10:30:45 +02:00
nojhan
ab1a6a4219 bugfix svn branch name, match more than just alphabetic characters, handle nested dirs 2012-08-05 09:13:31 +02:00
nojhan
e30b5fc651 typofix: add comma between lines changed and pending commits 2012-08-04 19:55:56 +02:00
nojhan
20d2e909bc show the number of added/deleted lines, if changes have been made in a GIT repository 2012-08-04 19:52:24 +02:00
nojhan
6dea91ecf6 keep existing PROMPT_COMMAND if available 2012-08-04 19:19:09 +02:00
nojhan
c46f027b42 do not overwrite PROMPT_COMMAND and set it back with prompt_off 2012-08-04 19:11:04 +02:00
nojhan
bf46824121 You can temporarily deactivate the liquid prompt and come back to your previous one by typing . Use to bring it back. 2012-08-04 19:05:34 +02:00
nojhan
ee45f66c36 clean PS1 building 2012-08-04 18:24:06 +02:00
nojhan
2ac8de6f4b use the -rc suffix for the config file 2012-08-04 17:51:13 +02:00
Thomas DEBESSE
8f712bb0c0 try the XDG Base Directory Specification if the dotfile is not here 2012-08-04 17:47:56 +02:00
nojhan
6ae758f569 remove feature list (see the README), add the list of authors 2012-08-04 12:05:03 +02:00
nojhan
fdd10f9bac Merge pull request #12 from LudovicRousseau/master
Set default values only if not already defined, support directory names with white space(s) inside, remove spaces around numbers of SVN changes.
2012-08-04 02:05:10 -07:00
Ludovic Rousseau
42e3fd3922 Set default value only if not already defined
Use the bash construction ${parameter:-word} to define default values
only if they are not already defined.
2012-08-03 23:07:32 +02:00
Ludovic Rousseau
a114b8ccc4 Merge remote branch 'upstream/master'
Conflicts:
	liquidprompt.bash
2012-08-03 22:59:18 +02:00
Thomas DEBESSE
7dc9e82d8a bugfix: do not use 158 if not set, defaults to 80 2012-08-03 21:29:59 +02:00
nojhan
65b9e62ab3 update the doc about the configuration 2012-08-01 19:33:32 +02:00
Ludovic Rousseau
ab4ac41eb5 Support directory names with white space(s) inside
If you "cd ~/Library/Application Support" or any directory containing a
white space then bash will run in an endless loop.

This is because __shorten_path $PWD $PATH_LENGTH is used instead of
__shorten_path "$PWD" $PATH_LENGTH
Note the use of "" around $PWD in the fixed version.

In case of the bug we have in the __shorten_path function
$1 is set to ~/Library/Application
$2 is set to Support
$3 is set to $PATH_LENGTH

With the fix we now have:
$1 set to ~/Library/Application Support
$2 set to $PATH_LENGTH
2012-08-01 14:00:51 +02:00
Ludovic Rousseau
5dd4d82ec6 Remove spaces around numbers of SVN changes
With 1 file changed in the SVN repo I get:
± svn status | grep -v "?" | wc -l
       1

So the prompt is:
[...] trunk(       1) ±
with the white spaces at the left of 1

By converting the number of commits from text to numeric the white
spaces are removed.
2012-08-01 13:14:56 +02:00
nojhan
8d5d088f1d move configuration variables in a separated file 2012-07-31 22:15:07 +02:00
nojhan
93b701a637 undo commit a00de370c5, let Darwin be specific again 2012-07-31 21:27:53 +02:00