Commit Graph

2606 Commits

Author SHA1 Message Date
Nils Winkler
04937aa2ec Merge pull request #1312 from kylewelsby/bugfix/1203-bug-enable-alias-all
Fixes #1203 convert alias to aliases
2019-01-21 08:36:38 +01:00
Nils Winkler
78e9c0cf6a Merge pull request #1311 from kylewelsby/bugfix/missing-tmp-cache-exit-1
Fixes early exit if tmp cache is missing
2019-01-21 08:35:07 +01:00
Nils Winkler
a967bc4d2f Merge pull request #1310 from kylewelsby/master
Fixes #1309 _bash-it-clean-component-cache: command not found
2019-01-21 08:33:06 +01:00
Kyle Welsby
ca58587217 Fixes #1203 convert alias to aliases
A ungraceful patch but fixes this one case where the command is singular `alias` while the file are plural with `aliases.
2019-01-16 18:16:08 +00:00
Kyle Welsby
fedb72b34f Fixes exit 1 issue when tmp cache doesn't exist
Found if this `${cache}` file doesn't exist, the single line conditional command would return false causing a `exit 1`.

This little change makes the conditional verbose and not cause a false return failing the function.
2019-01-16 17:36:57 +00:00
Kyle Welsby
56945e3bdf Fixes #1309 _bash-it-clean-component-cache: command not found
Silence errors when installing

```
Would you like to enable the ag aliases? [y/N] y
~/.bash_it/lib/helpers.bash: line 488: _bash-it-clean-component-cache: command not found
ag enabled with priority 150.
```
2019-01-16 17:15:23 +00:00
Nils Winkler
792593c995 Merge pull request #1273 from kigster/kig/search/improved
Speed up bash-it Search & support exact matches
2019-01-14 09:05:02 +01:00
Nils Winkler
9f61cd3338 Merge pull request #1306 from LanikSJ/brew-cleanup
Remove Deprecated Brew Command
2019-01-09 09:10:30 +01:00
LanikSJ
ec088d4271 Remove Deprecated Brew Command 2019-01-08 14:01:54 -08:00
Nils Winkler
7a5b797da1 Merge pull request #1302 from tbhaxor/wpscan-completion
added wpscan completions
2019-01-07 08:31:23 +01:00
Nils Winkler
606e2586f1 Merge pull request #1303 from tbhaxor/vuejs-completions
added vuejs completions
2019-01-07 08:23:57 +01:00
tbhaxor
a636f602c8 added main option 2019-01-07 01:23:00 +05:30
tbhaxor
508f82eb95 added vuejs completions 2019-01-07 01:18:37 +05:30
tbhaxor
fe8f5e42d0 added wpscan completions 2019-01-07 01:10:21 +05:30
Nils Winkler
7cfa6a33fb Merge pull request #1300 from claui/fix-reload-regression
Make `bash-it reload` preserve working directory
2019-01-03 11:18:07 +01:00
Claudia
0fe631ea7c Make bash-it reload preserve working directory
In e5b6869 (part of #1283), a regression was introduced, which caused
`bash-it reload` to return with the working directory set to
`.bash_it` and the original working directory discarded.

The root cause is the function wrapper of `bash-it reload`, which has
always relied on the working directory not to change during execution
of the wrapped code. This assumption no longer holds with the changes
introduced in #1283.

This commit fixes the regression by using `pushd`/`popd` in `bash-it
reload`.
2019-01-02 17:45:43 +01:00
Nils Winkler
3b47bc3684 Merge pull request #1294 from devopsdeluxe/theme_essential
New theme: essential
2018-12-29 12:15:37 +01:00
Dan Beste
7b41736d17 New theme: essential
A simple, console-compatible Bash-it theme.

Features:
  * Reactive coloring for:
    * Privileged and standard users.
    * Local and remote hosts.
    * Exit status for prompt strings 1 and 2.
  * Console-compatible!
    * No unicode "tofu" in console sessions.
  * Matching alignment for prompt strings 1 and 2.

Preview:

    $PS1| $TIME $USER@$HOST:$PWD
    $PS1|  + function foo() {
    $PS2|  |   bar
    $PS2|  |   baz
    $PS2|  | }
2018-12-28 21:26:28 -06:00
Nils Winkler
e3acbc1f61 Merge pull request #1289 from zou000/master
Add alias for listing untracked files
2018-12-28 09:01:49 +01:00
Li Zou
2bc990269a Add alias for listing untracked files 2018-12-22 15:25:08 -08:00
Nils Winkler
b5f2cc3d4e Merge pull request #1287 from nwinkler/percol-fix
Fix Percol plugin
2018-12-18 09:28:17 +01:00
Nils Winkler
ca5c512a35 Removed 'local' keyword 2018-12-18 09:26:25 +01:00
Nils Winkler
b973bb1e3e Merge pull request #1285 from con-f-use/master
Fix dependency of docker aliases on docker plugin functions
2018-12-12 12:52:54 +01:00
con-f-use
60b3572f7c Purge $subdirectory leftover in docker aliases 2018-12-11 21:10:52 +01:00
con-f-use
7136604b57 Fix dependency of docker aliases on docker plugin
Some of the docker aliases use functions found in the docker plugin. If the plugin is not enabled, these aliases do not work. This commit only defines the aliases if the plugin is enabled.

Also changed: `dkelc` now creates an explicit login shell, has the synonym `dkbash` and uses no backticks. Reason: on some docker images the status as login-shell is not set automatically, which causes e.g. `/etc/bash.bashrc` and `/etc/profile` not to be loaded in these images.

Note: There should be a convenience function in `lib/helpers.bash` that checks if a plugin is available/enabled/disabled. The if-statement if rather clonky.
2018-12-10 15:03:10 +01:00
con-f-use
247b00fc36 Merge pull request #1 from Bash-it/master
Sync with original bash-it repo
2018-12-10 12:38:48 +01:00
Travis Swicegood
7f34570a05 Merge pull request #1267 from cornfeedhobo/fix-go-env-vars
Add multiple path support to go plugin
2018-12-06 22:07:21 -06:00
cornfeedhobo
1030c0e9e1 one more test ... why not 2018-12-06 17:11:13 -05:00
cornfeedhobo
3645305644 add go plugin tests and update list reversal logic 2018-12-06 17:07:03 -05:00
Travis Swicegood
1dadfc92ba Merge pull request #1283 from Bash-it/bugfix/bash_completion_debian
Bugfix - issue with sourced files (noted by @caguettaz)
2018-12-05 22:07:07 -06:00
Travis Swicegood
2d6085b033 Switch from false to skip – I think that's more clear 2018-12-05 21:58:13 -06:00
Travis Swicegood
7b32dd6424 Add filtering to the $2 input in addition to $1 2018-12-05 21:54:59 -06:00
Travis Swicegood
5b8f8d874e Default to loading everything
The tests are failing because $1 is being passed through from the
initial loading. When this loads in the shell, $1 is empty though so
the code works-for-me, but just not the tests.

This filters the $1 input to ensure its one of the valid types
expected inside the ./enabled directory.
2018-12-05 21:53:39 -06:00
Travis Swicegood
c76263dc47 Ensure this debugging output is generated (oops) 2018-12-05 21:04:55 -06:00
Travis Swicegood
992b87b816 Shellcheck clean up based on comments from @nwinkler 2018-12-05 21:00:59 -06:00
Travis Swicegood
0793eb41a7 Ignore SC2139 – it's ok that these are expanded when evaluated 2018-12-05 21:00:41 -06:00
Travis Swicegood
61380e686f Remove unused function 2018-12-05 21:00:09 -06:00
Travis Swicegood
286e695910 Ensure that shellcheck can find these files (SC1090) 2018-12-05 20:59:37 -06:00
Nils Winkler
262a7517e3 Merge pull request #1282 from Bash-it/tweak/update-contributing
Tweak the language around force pushes
2018-12-05 08:37:32 +01:00
Nils Winkler
3a7889e05b Update CONTRIBUTING.md
Fixed capitalization of Bash-it.
2018-12-05 08:37:13 +01:00
Travis Swicegood
e5b68695c0 Attempt to simplify by not using aliases 2018-12-04 22:02:10 -06:00
caguettaz
13b6f3d870 [cleanup] Cleaned escaped newlines for alias reload 2018-12-04 16:31:03 +01:00
caguettaz
a1bbecc4a5 [bugfix] Fixed reload aliases 2018-12-04 15:58:21 +01:00
caguettaz
e198d8dc3d [bugfix] Fixed config family names for reload aliases 2018-12-04 14:58:13 +01:00
Travis Swicegood
87d74c31d8 Tweak the language around force pushes 2018-12-04 07:49:32 -06:00
caguettaz
f06439edc3 [cleanup] Harmonized variable names, added support for global config files 2018-12-04 14:30:11 +01:00
Travis Swicegood
374ba8c8ec Merge pull request #1281 from Bash-it/fix/show-only-merges-into-master
Adjust to only show merges into master
2018-12-03 21:20:49 -06:00
Travis Swicegood
20b61a362f Merge remote-tracking branch 'origin/master' into fix/show-only-merges-into-master 2018-12-03 21:17:56 -06:00
Travis Swicegood
babb1e6675 Adjust to only show merges into master
Adding `--first-parent` ensures that only commits from the master branch
are used when showing the history. I've verified this change directly
by comparing the `rev-list` output for `703105c..97df5c45`:

```console
$ git rev-list --merges 703105c...97df5c4
97df5c4540
b5976ada25
$ git rev-list --merges --first-parent 703105c...97df5c4
97df5c4540
```

Note: I've created this branch from 703105c so that I can merge `master`
into it and test `bash-it update` once merged.
2018-12-03 21:17:49 -06:00
Travis Swicegood
97df5c4540 Merge pull request #1143 from eedwards-sk/GH-1142
GH-1142 add behavior to address using set -e
2018-12-02 21:14:26 -06:00