nojhan
0125ee0cef
manual merge
2012-08-13 23:17:45 +02:00
nojhan
7b8ba5e7f9
fix #26 : prefix with _lp_ or LP_ and local variables
2012-08-13 23:15:24 +02:00
Luc Didry
34826d0353
Fix bug : forgot to change a 'bash' into ${WORKING_SHELL}
2012-08-13 23:07:58 +02:00
Poil
6f0bf08f61
faster TTY grab
2012-08-13 22:43:13 +02:00
nojhan
3b6d8c8e68
typo bad merge
2012-08-13 22:41:57 +02:00
nojhan
b882e1550e
merge shell grab and mac shell
2012-08-13 22:37:27 +02:00
nojhan
9fb2965c4b
adapter mark default set
2012-08-13 22:28:50 +02:00
nojhan
956ed8717c
Merge branch 'master' of https://github.com/nojhan/liquidprompt
2012-08-13 22:24:19 +02:00
nojhan
45fddb4517
feature #25 : unicode chars only for utf-8 charset, else latin
2012-08-13 22:23:43 +02:00
Luc Didry
0d0f8f108d
Update comments
2012-08-13 22:09:49 +02:00
nojhan
ac5e05266b
Merge pull request #27 from LudovicRousseau/master
...
Correctly handle login shell
2012-08-13 12:34:51 -07:00
Poil
09d6ff48a7
Other improvment
2012-08-13 21:01:33 +02:00
Poil
7e8fc0e01f
New shell detection
2012-08-13 20:47:29 +02:00
Poil
5db1507b96
Small improvement
2012-08-13 20:40:36 +02:00
Luc Didry
32a89f5b90
Update vim modeline since there is no more shebang
...
Without shebang, vim doesn't know the filetype => syntaxic color off
2012-08-13 20:20:18 +02:00
Ludovic Rousseau
86f8dba07f
A login shell starts with a "-"
...
A login shell process is started with a "-" as the first character in
the process name. It is the case with Terminal on Mac OS X.
See http://docstore.mik.ua/orelly/unix/upt/ch51_09.htm
2012-08-13 16:37:56 +02:00
Ludovic Rousseau
0818aa1869
Warn if the shell is not supported
...
If the shell is not recognised as a supported ("bash" and "zsh" for now)
then a warning will be displayed in red.
For example on Mac OS X the shell process is named "-bash" (note the
first character) and is not yet recognised as a valid shell name.
2012-08-13 16:37:49 +02:00
Luc Didry
4c023a2a94
Fix bug: __battery:local:3: not an identifier: 0:
2012-08-13 16:34:02 +02:00
Luc Didry
c2fdb1751e
Fix bug in load printing (% not escaped in zsh)
...
Same thing than c8f01e68a3
2012-08-13 15:20:20 +02:00
Luc Didry
e9099d15a3
Allow to have a /etc/liquidpromptrc
...
Permit to have a modified configuration base for all users
2012-08-13 14:30:54 +02:00
Luc Didry
39fc1df488
Smaller shell detection (Thx to Michel Barret)
2012-08-13 11:44:09 +02:00
Luc Didry
a11b838116
Change charging battery symbol and color
2012-08-13 10:02:10 +02:00
nojhan
ee7514bb1e
Merge branch 'master' of https://github.com/nojhan/liquidprompt
2012-08-13 09:35:55 +02:00
nojhan
f1fd9af32a
update the readme
2012-08-13 09:35:50 +02:00
nojhan
a96b5934e2
Merge pull request #23 from ldidry/master
...
Bugfix battery zsh
2012-08-13 00:32:57 -07:00
Luc Didry
9a33acef08
Fix bug: __battery:local:3: not an identifier: 0:
2012-08-13 09:27:14 +02:00
nojhan
1243987b80
Merge https://github.com/ldidry/liquidprompt
2012-08-12 12:16:10 +02:00
nojhan
508b218004
Indicate if the battery is (dis)charging
...
Displays:
* a green ⌁ if the battery is charging and above a given threshold,
* a yellow ⌁ if the battery is charging and under threshold,
* a red ⌁ if the battery is discharging but above threshold;
2012-08-12 12:13:47 +02:00
Luc Didry
e754319c9c
Fix bug : shorten path didn't work anymore
...
Stupido ! How can I have the length of $p before
its attribution ? Shame on me.
2012-08-12 11:18:18 +02:00
nojhan
697bb3a31a
Merge https://github.com/ldidry/liquidprompt
2012-08-12 11:04:11 +02:00
Luc Didry
f7de6d019b
Bug fix : no more path in bash ☹
2012-08-12 11:02:48 +02:00
nojhan
2bc1304de0
Merge pull request #21 from ldidry/master
...
Two more bugfixes
2012-08-12 01:59:33 -07:00
Luc Didry
2810d481aa
Fix typo and remove trailing space
2012-08-12 10:52:03 +02:00
Luc Didry
fb5860bd26
Fix bug in shorten_path for zsh
2012-08-12 10:51:29 +02:00
nojhan
83ae9cada8
Merge pull request #20 from ldidry/master
...
Liquidprompt for bash AND zsh
2012-08-12 01:44:24 -07:00
Luc Didry
c8f01e68a3
Battery printing bug in zsh part (special character not escaped)
2012-08-12 10:38:52 +02:00
Luc Didry
c3ba849ced
Update README.md for zsh merge
2012-08-12 10:10:50 +02:00
Luc Didry
4e94fa71ff
Improvments for zsh shorten_path
2012-08-12 10:08:59 +02:00
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
