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

642 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
nojhan
7edb81287e Merge pull request #128 from ldidry/badregex 
Fix bad regex for submodule from #118
 2013-03-25 12:07:45 -07:00
nojhan
b4d83f7fcf Merge pull request #126 from jsleroy/master 
Add shortened path mark user configuration
 2013-03-25 12:03:34 -07: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
dc0edaeda5 Merge branch 'master' of https://github.com/jpec/liquidprompt into develop 2013-03-15 20:15:20 +01: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
9bae88a686 update README about tmux support. 2013-03-14 23:18:20 +01: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
Julien Pecqueur (JPEC)
729459c9d9 Add Archlinux PKGBUILD. 2013-03-14 20:09:06 +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
nojhan
9d42e53c1e Merge pull request #118 from dotinfra/develop 
git submodules & no title for linux console
 2013-03-14 03:32:39 -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
9d4ded5799 Update the README 
Bazaar support and LP_PS1_FILE were missing.
 2013-03-13 11:56:28 +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
nojhan
f23bac5325 Merge pull request #111 from ldidry/108 
Issue #108 - Zsh:error in git dir if there is new files
 2013-03-12 12:44:08 -07:00
nojhan
0703a0ca19 Merge pull request #112 from ldidry/107 
Issue #107 - same error appears with LP_ENABLE_SSH_COLORS new feature
 2013-03-12 12:43:11 -07: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
Nicolas LACOURTE
834d3ddea9 Suppress double escape in screen title 2013-03-08 12:05:42 +01:00
Nicolas LACOURTE
2296081d01 Add case for screen title escape chars 2013-03-08 12:05:42 +01:00
nojhan
4a64c6ccec Bugfix: avoid replacing "/home/user-alt" by "~-alt" 
Add escaped backslashes so as to replace the "/home/user/" string in the path by "~/"
 2013-03-07 21:08:14 +01:00
nojhan
b55126e7d3 Display colored brackets in a term multiplexer 
A pair of square brackets, colored in blue if your current shell is running in a
terminal multiplexer (screen or tmux).
 2013-02-26 14:18:58 +01:00
nojhan
516f982f82 Merge branch 'develop' 2013-02-26 13:39:43 +01:00
nojhan
31caf8a72d Add the lptag function to add a prefix 
Note: the `lptag` function is  convenient way to add a prefix. You can thus add
a keyword to your different terminals:

    [:~/code/liquidprompt] develop ± lptag mycode
    mycode [:~/code/liquidprompt] develop ±
 2013-02-26 13:37:31 +01:00