Commit Graph

43 Commits

Author SHA1 Message Date
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
nojhan
178ac74822 bugfix issue #1 : suppress the need for BSD-like extended regexp 2012-07-24 10:50:26 +02:00
nojhan
782df4845c Merge pull request #5 from rmdir/master
DragonFly and OpenIndiana portability
2012-07-24 01:08:46 -07:00
nojhan
dcf74ba207 battery and load display threshold parameters 2012-07-24 09:49:51 +02:00
nojhan
789b818188 bugfix bad conditional statement for battery < 10% 2012-07-24 09:39:22 +02:00
joris
1d400a746f Style correction 2012-07-23 16:40:43 +02:00
joris
ead8a9ff41 Add DragonFly and Solaris (?) portability. SunOS is only test on
openindiana (SunOS 5.11 oi_151a2 i86pc i386 i86pc Solaris)

Battery state is untested on those OS
2012-07-23 16:05:49 +02:00
nojhan
e5f558c08d default OS goes to Linux 2012-07-22 22:28:50 +02:00
nojhan
f19f16d6d1 use differents terminfo arguments under freebsd or linux 2012-07-22 22:11:09 +02:00
Joris Dedieu
6d1cfd8f1d Change tput calls to use termcap instead of terminfo. Because it's
unsupport on some systems like FreeBSD.

Changes make color working on both FreeBSD and Linux
2012-07-20 14:10:13 +02:00
joris
754839ae76 In some linux distro logname somtimes returns with error.
Eg:

$ LANG=C logname ; echo $?
logname: no login name
1

Fix this by redirecting stderr to /dev/null. Also protect the var
for test(1) if it's empty.
2012-07-20 12:54:12 +02:00
joris
5ac2cd94e0 Start protablility infrastructure. An OS variable is store at sourcing.
Non portable functions are called with __function_$OS. This way you
don't have to call "uname" at each prompt.

Currently ported functions :
- __load | Linux, FreeBSD | detect current system load
- __cpunum | Linux, FreeBSD | number of cpu
2012-07-20 12:50:05 +02:00
nojhan
94133ad1c8 different color if the user is not the login one 2012-07-19 15:08:18 +02:00
nojhan
c13e6d795f explanations about liquidprompt 2012-07-19 14:17:32 +02:00
nojhan
0d18997b32 use the project name 2012-07-19 11:57:55 +02:00