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

64 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Ludovic Rousseau
1a51210e22 Revert "less indirections, directly call FreeBSD primitives" 
This reverts commit a00de370c5.
 2012-07-31 10:57:27 +02:00
Ludovic Rousseau
833ab6b6cf Use the REVERSE variable to use black on white 
Having to edit the liquidprompt.bash file to select a configuration is a
bad idea. Configuration shall be external to the file to avoid any
modification compared to the official version.

It is easy to pass paramaters to the script by using (in the present case):
$ REVERSE="1" source liquidprompt.bash
 2012-07-31 10:01:40 +02:00
nojhan
bf85104290 add reverse colors support (issue #9), use more appropriate color names 2012-07-31 00:07:50 +02:00
nojhan
cb87b588af use modern POSIX command substitution instead of the deprecated one 2012-07-30 22:05:20 +02:00
nojhan
d3e092a0fb use modern conditional expressions instead of the deprecated test command 2012-07-30 21:46:29 +02:00
nojhan
a00de370c5 less indirections, directly call FreeBSD primitives 2012-07-30 21:22:16 +02:00
Ludovic Rousseau
99aa8e334b Do not fail if screen(1) is not installed 
If screen is not present then an error message is displayed each time
the prompt is displayed:
-bash: screen : command not found

The error message is now sent to /dev/null
 2012-07-30 11:01:04 +02:00
Ludovic Rousseau
081316ec5c Add Darwin (Mac OS X) support 
Darwin is based on FreeBSD.
 2012-07-30 10:41:23 +02:00
nojhan
67ba690d55 a green colon if the user has write permissions on the current directory, a red one if he has not 2012-07-29 22:19:34 +02:00
nojhan
1745851759 add detached screen session count 2012-07-29 22:05:19 +02:00
nojhan
f39fa12bc5 Keep some left part of the shortened path 
When shortening the path, keep the PATH_KEEP left most directories (from root,
except for ~), then insert " … ", then the rest of the shortened path.
 2012-07-28 22:26:10 +02:00
François Schmidts
dafa924c02 sometimes processor is written Processor in /proc/cpuinfo 2012-07-26 11:24:29 +02:00
François Schmidts
a17a3ccf33 replace home path with a tild 2012-07-26 11:22:17 +02:00
nojhan
4f1f6f5cfb deactivate the anti-glitche glue, not necessary anymore? 2012-07-26 09:50:20 +02:00
nojhan
9df3232952 use a single unicode dots char instead of three dots 2012-07-26 09:18:01 +02:00
nojhan
bc8cbb7d36 use a percentage of screen width to shorten path 2012-07-26 09:16:36 +02:00
nojhan
9dd18935c3 add a displayed path length parameter 2012-07-25 14:22:57 +02:00
nojhan
2ed0a4190a indent with spaces, add corresponding modeline 2012-07-25 14:19:53 +02:00
nojhan
33cc6bf349 root vcs prompt mark for every vcs available 2012-07-25 14:08:17 +02:00
Florian Le Frioux
275f6abc69 new feature : as root, in a git repo the ± replace the # 2012-07-25 14:05:00 +02:00
Aurelien Requiem
cb1ea61d57 added variable length path to the prompt 2012-07-25 10:42:42 +10:00
Aurelien Requiem
17f3bd32ba added condition check to prevent sourcing the prompt if no $TERM as tput needs it 2012-07-25 10:13:47 +10:00