Commit Graph

1256 Commits (dfe811719f2f4eeb304e5cf264d45d6f2709b5cc)

Author SHA1 Message Date
宋信强 bdf1ede7ef a new theme:axin,based on 'sexy' 2015-08-21 17:23:12 +08:00
Simon Fiddaman 6c82269121 Skip ssh hashed hosts 2015-08-20 17:37:46 +02:00
goromlagche e525ea1fbe clock_check added, datetime added instaed of clock, also battery_percentage added 2015-08-12 22:59:18 +05:30
Nils Winkler c00e22d6bf Merge pull request #547 from keymon/bugfix/546_infite_loop_ps4_with_command
Fix #546: infinite loop when $PS4 calls external command
2015-08-12 15:57:42 +02:00
Hector Rivas Gandara 2360790ee3 Fix infinite loop when $PS4 calls external command
When using `set -x` with a `$PS4` variable which calls a external
command (e.g. `PS4='+ $(true)'`) the color functions end in a infite
loop.

The solution is `shift` the arguments unconditionally in the color
funtions.

This fixes #546
2015-08-12 12:00:14 +01:00
goromlagche 39b5d0b042 adding time to bobby 2015-08-12 00:20:50 +05:30
Omer Katz 2541ca965a Merge pull request #543 from nwinkler/install-options-sane
Updated install script
2015-08-11 11:23:06 +03:00
Nils Winkler 63add1f86a Added load_some function again
It can be called by providing the `--interactive` switch to the install
script.
2015-08-06 16:52:37 +02:00
Nils Winkler 237816b782 Updated install script
Removed Jekyll template option - it does not really belong in Bash-it.

Removed the all/some/none options. Most people selected `all` and then
complained about things not working, or error messages being shown. This
was mostly due to missing dependencies.

The installer now uses a 'sane' default - it just enables completion for
the 'bash-it' command and nothing else. At the end of the installation,
it prints a message explaining the ways to see the available plugins and
how to enable them.

Updated readme with install options
2015-08-06 09:51:39 +02:00
Nils Winkler a161455c98 Merge pull request #539 from nwinkler/uninstall
Uninstall script and instructions
2015-08-06 08:48:36 +02:00
Nils Winkler d64201791d Merge pull request #542 from dvergeylen/master
Added 'catt' alias which displays content whatever regular file or folder
2015-08-05 11:32:27 +02:00
Daniel Vergeylen 0fb33e457e Added 'catt' alias, which displays file content or folder content, according to file type. 2015-08-05 11:09:14 +02:00
Nils Winkler a418c6970c Merge pull request #540 from nwinkler/battery-percentage-powerline
Fixed battery conversion
2015-08-04 11:32:36 +02:00
Nils Winkler 658cfb7d6e Fixed battery conversion
For battery percentages of 08 and 09 percent, the `-le` would fail with
an error ("value too great for base"), since the numbers with leading
zeros are treated as octal numbers when using double brackets.

The solution is to force base 10 for the numbers. More details here:
http://stackoverflow.com/a/24777667/1228454
2015-08-04 11:31:01 +02:00
Nils Winkler 1553a7ad80 Only setting environment variable if not already set 2015-08-04 10:40:00 +02:00
Nils Winkler 2f64aaec6c Added uninstall instructions 2015-08-04 10:34:37 +02:00
Nils Winkler b68472c959 Added first draft of uninstall script 2015-08-04 10:34:25 +02:00
Nils Winkler 3828f6756d Merge pull request #538 from minamarkham/master
New theme, named 'cupcake'
2015-08-03 09:36:43 +02:00
Mina Markham bc7bcf0883 adding cupcake theme 2015-08-03 02:53:35 -04:00
Nils Winkler 1aadb24f38 Merge pull request #529 from ranaamritparth/theme/rana
New Theme
2015-08-02 18:36:41 +02:00
Nils Winkler e32022c8cf Merge pull request #536 from ritola/dulcie-theme-upgrades
Dulcie theme upgrades
2015-08-02 18:31:58 +02:00
Heikki Ritola 436a25ed84 Dulcie theme upgrades
- Colorize prompt
- Support for multiline prompt
- Set tab title (OSC 0) and keep the current directory (OSC 7)
2015-08-02 12:18:35 +03:00
Nils Winkler 766eb1f8c9 Merge pull request #534 from nwinkler/docker-enter
Moved docker-enter function to docker plugin
2015-07-30 14:26:33 +02:00
Nils Winkler 04907a7197 Moved docker-enter function to docker plugin
Using the recommended enter approach (exec) instead of the previously
used nsenter.
2015-07-30 14:25:37 +02:00
Nils Winkler 6512be5222 Merge pull request #523 from nwinkler/docker-split
Docker plugin --> boot2docker, docker-machine plugins
2015-07-30 14:21:39 +02:00
Nils Winkler 6531938ade Merge pull request #533 from nwinkler/less-pretty-cat-check
Fixed error handling in less-pretty-cat plugin
2015-07-28 15:51:43 +02:00
Nils Winkler d12d78ddaf Fixed error handling in less-pretty-cat plugin
When pygmentize is not installed, the functions less/cat are not
defined, the native commands will be used instead. Also removed the
error message that was shown when the command was not found.

Using `command -v` instead of `which` to check for the existence of the
executable - this works better as it does not print an error message if
the executable is not found.
2015-07-28 15:50:21 +02:00
Nils Winkler 77d82a43d7 Merge pull request #532 from haomingz/plugins-fix
fix pyenv plugins PATH env
2015-07-27 09:08:29 +02:00
Haoming Zhu 6bf011a1f4 fix pyenv plugins PATH env 2015-07-26 12:49:37 +08:00
Nils Winkler 56a3287319 Merge pull request #531 from aashah/patch-1
Update base.theme.bash
2015-07-24 08:57:49 +02:00
Aakash Shah 0e456639d7 Update base.theme.bash
Fix support for recognizing git when in submodules and the regression when in subdirectories of a git repository.
2015-07-23 13:58:55 -07:00
Rana Amrit Parth 8b2b2cae60 New Theme 2015-07-21 23:29:22 +05:30
Rana Amrit Parth 38f9cb6bc5 New theme rana 2015-07-21 18:58:17 +05:30
Nils Winkler b1b559f173 Merge pull request #527 from sveneh/master
added simple uninstall instructions
2015-07-21 08:37:12 +02:00
sveneh d2782c07b9 added simple uninstall instructions 2015-07-20 18:29:32 +02:00
Nils Winkler 00a620ce65 Merge pull request #526 from nwinkler/textmate-check
Added check for presence of textmate executable
2015-07-20 17:47:00 +02:00
Nils Winkler cdfe76620a Added check for presence of textmate executable 2015-07-20 17:41:55 +02:00
Nils Winkler 4b66fec9da Merge pull request #471 from ratberryjam/fix-set_xterm_title-for-osx
Fix for issue #108 that restores xterm plugin functionality on OS X.
2015-07-20 09:57:19 +02:00
Nils Winkler e32dca1c35 Merge pull request #525 from wendorf/master
Show git prompt when in a detached HEAD state
2015-07-20 09:01:37 +02:00
Dan Wendorf c711b1b575 Show git prompt when in a detached HEAD state
The current check of `git symbolic-ref HEAD` does not detect git
repositories in the 'detached HEAD' state. This is the state a
repository is in if HEAD is not pointing to a valid branch or tag (e.g.
you are in a recently-initiated submodule).
2015-07-16 18:06:48 -07:00
Nils Winkler 90271980fd Moved boot2docker functionality to its own file. Also added a docker-machine plugin, which sets the same variables for docker-machine. 2015-07-16 13:14:00 +02:00
Nils Winkler 3a07bb75b2 Merge pull request #515 from JrGoodle/git-submodule-update-alias
Add 'gsu' alias for updating git submodules
2015-06-29 08:19:48 +02:00
joe DeCapo 6b38a470fc Add 'gsu' alias for updating git submodules
Updates and initializes submodules recursively
2015-06-29 00:48:38 -05:00
Nils Winkler 2dd46920eb Merge pull request #514 from nwinkler/osx-tabs
Added check for OS X update_terminal_cwd
2015-06-26 08:17:25 +02:00
Nils Winkler b97a21bb8a Merge pull request #513 from nwinkler/docker-settings
Updated boot2docker settings
2015-06-25 12:35:06 +02:00
Nils Winkler 5d00373359 Added check for OS X update_terminal_cwd
This will allow to open new terminal tabs in the same directory as the
current terminal. Uses the fact that plugins are loaded after the
selected theme. Themes often manipulate the $PROMPT_COMMAND variable.

Implementation inspired by the pathmunge function.
2015-06-25 12:26:53 +02:00
Nils Winkler 27c5500873 Updated boot2docker settings
Changed port to 2376.
Added cert path and TLS verify.
2015-06-22 07:51:49 +02:00
Nils Winkler 5e61b73a87 Merge pull request #511 from jawshooah/git-subrepo
Add git-subrepo plugin
2015-06-18 17:57:27 +02:00
Josh Hagins 51872d7bee Add git-subrepo plugin 2015-06-18 11:51:51 -04:00
Nils Winkler 48f5e85776 Merge branch 'jawshooah-homebrew-edit-alias' into upstream_master 2015-06-18 08:27:38 +02:00