Skip to content

Commit b554ce9

Browse files
douglasjacobsendouglasjacobsen
committed
Merge remote-tracking branch 'upstream/master'
* upstream/master: (1190 commits) Add support to powerline themes to override foreground color (Bash-it#2231) ci: Update GitHub actions v2 => v4 (Bash-it#2224) docs: Update Bats libraries links (Bash-it#2225) fix: bumps go version to 1.21.0 and changes go get to go install [terraform] add alias for terraform workspace fix (completion): suppress 1091 in brew (Bash-it#2130) Allow for longer command min duration (Bash-it#2198) Implement yarn completion (Bash-it#2190) Fix lint errors in multiple files (Bash-it#2192) bug: Use C style strings when checking for invalid alias characters (Bash-it#2188) Remove libra chat reference Add more aliases for `git branch`, use long form remove function wrapper around kubectl alias registration bug: Use en_US when fetching EPOCHREALTIME bug:Install shellcheck wget (Bash-it#2173) fix(theme): use correct escape sequence to avoid weird text overwriting chore: Use grep -E / grep -F instead of egrep / fgrep (Bash-it#2164) Fixed broken code blocks in troubleshooting.rst Removed Bash Dependency section from README and added it to troubleshooting.rst Update variable name to match projects.plugin.bash ...
2 parents 5bada48 + d985e4c commit b554ce9

File tree

437 files changed

+22250
-19751
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

437 files changed

+22250
-19751
lines changed

‎.editorconfig‎

100755100644
Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,36 @@
11
# EditorConfig is awesome: http://EditorConfig.org
22

3-
root = true
4-
53
[*]
64
indent_style = space
75
indent_size = 2
86
end_of_line = lf
97
charset = utf-8
8+
109
trim_trailing_whitespace = true
1110
insert_final_newline = true
1211

13-
[*.md]
12+
[**.{md,rst}]
1413
trim_trailing_whitespace = false
14+
15+
[.git*]
16+
indent_size = tab
17+
indent_style = tab
18+
19+
[{**.*sh,test/run,**.bats}]
20+
indent_size = tab
21+
indent_style = tab
22+
23+
shell_variant = bash
24+
binary_next_line = true # like -bn
25+
switch_case_indent = true # like -ci
26+
space_redirects = true # like -sr
27+
keep_padding = false # like -kp
28+
end_of_line = lf
29+
charset = utf-8
30+
trim_trailing_whitespace = true
31+
insert_final_newline = true
32+
33+
[**.bats]
34+
indent_size = tab
35+
indent_style = tab
36+
shell_variant = bats

‎.gitattributes‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,9 @@
11
*.sh text eol=lf
22
*.bash text eol=lf
3+
4+
# Docs allow trailing whitespaces
5+
*.md whitespace=-blank-at-eol
6+
*.rst whitespace=-blank-at-eol
7+
8+
# Windows files
9+
*.bat text eol=crlf

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
name: 🐛 Bug report
2+
title: "[Bug]: "
3+
description: Create a bug report to help us improve
4+
labels: "bug:general"
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Expected behavior
9+
description: Tell us what should happen.
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: Current behavior
15+
description: Tell us what happens instead of the expected behavior.
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Possible solution
21+
description: Tell us how it could be fixed at your glance.
22+
validations:
23+
required: false
24+
- type: textarea
25+
attributes:
26+
label: Context
27+
description: >
28+
How has this issue affected you? What are you trying to accomplish?
29+
Providing context helps us come up with a solution that is most useful in the real world.
30+
validations:
31+
required: false
32+
- type: textarea
33+
attributes:
34+
label: Steps to reproduce
35+
description: >
36+
Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
37+
validations:
38+
required: true
39+
- type: input
40+
attributes:
41+
label: Bash-it version
42+
placeholder: "How to get: bash-it version"
43+
validations:
44+
required: true
45+
- type: input
46+
attributes:
47+
label: List of enabled plugins, themes and aliases
48+
placeholder: "How to get: bash-it show plugins|themes|aliases (it is not a pipe)"
49+
validations:
50+
required: true
51+
- type: input
52+
attributes:
53+
label: Bash version
54+
placeholder: "How to get: bash --version"
55+
validations:
56+
required: true
57+
- type: input
58+
attributes:
59+
label: Operating system and version
60+
placeholder: "How to get: neofetch (or another command)"
61+
validations:
62+
required: true
63+
- type: textarea
64+
attributes:
65+
label: "bash-it doctor output"
66+
value: |
67+
```
68+
# How to get: bash-it doctor
69+
```
70+
validations:
71+
required: false
72+
- type: textarea
73+
attributes:
74+
label: Your ~/.bashrc
75+
value: |
76+
```bash
77+
# How to get: cat ~/.bashrc
78+
```
79+
validations:
80+
required: true
81+
- type: textarea
82+
attributes:
83+
label: Notes
84+
description: >
85+
Provide any extra details here.

‎.github/ISSUE_TEMPLATE/config.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
blank_issues_enabled: true
2+
contact_links:
3+
- name: Libera chat
4+
url: https://web.libera.chat/?channel=#bash-it
5+
about: You can ask and answer questions here

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: 💡 Feature request
2+
title: "[Feature]: "
3+
description: Suggest an idea for this project
4+
labels: "feature request"
5+
body:
6+
- type: textarea
7+
attributes:
8+
label: Expected behavior
9+
description: Tell us how your feature should work.
10+
validations:
11+
required: true
12+
- type: textarea
13+
attributes:
14+
label: Current behavior
15+
description: Explain the difference your feature will have from current behavior.
16+
validations:
17+
required: true
18+
- type: textarea
19+
attributes:
20+
label: Possible solution
21+
description: Tell us how it could be fixed at your glance.
22+
validations:
23+
required: false
24+
- type: textarea
25+
attributes:
26+
label: Context
27+
description: >
28+
How has this issue affected you? What are you trying to accomplish?
29+
Providing context helps us come up with a solution that is most useful in the real world.
30+
- type: textarea
31+
attributes:
32+
label: Notes
33+
description: >
34+
Provide any extra details here.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<!--- Provide a general summary of your changes in the Title above -->
2+
3+
## Description
4+
<!--- Describe your changes in detail -->
5+
6+
## Motivation and Context
7+
<!--- Why is this change required? What problem does it solve? -->
8+
<!--- If it fixes an open issue, please link to the issue here. -->
9+
10+
## How Has This Been Tested?
11+
<!--- Please describe in detail how you tested your changes. -->
12+
<!--- Include details of your testing environment, and the tests you ran to -->
13+
<!--- see how your change affects other areas of the code, etc. -->
14+
15+
## Screenshots (if appropriate):
16+
17+
## Types of changes
18+
<!--- What types of changes does your code introduce? Put an `x` in all the boxes that apply: -->
19+
- [ ] Bug fix (non-breaking change which fixes an issue)
20+
- [ ] New feature (non-breaking change which adds functionality)
21+
- [ ] Breaking change (fix or feature that would cause existing functionality to change)
22+
23+
## Checklist:
24+
<!--- Go over all the following points, and put an `x` in all the boxes that apply. -->
25+
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
26+
- [ ] My code follows the code style of this project.
27+
- [ ] If my change requires a change to the documentation, I have updated the documentation accordingly.
28+
- [ ] I have read the **CONTRIBUTING** document.
29+
- [ ] If I have added a new file, I also added it to ``clean_files.txt`` and formatted it using ``lint_clean_files.sh``.
30+
- [ ] I have added tests to cover my changes, and all the new and existing tests pass.

‎.github/no-response.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Configuration for probot-no-response - https://github.com/probot/no-response
2+
3+
# Number of days of inactivity before an Issue is closed for lack of response
4+
daysUntilClose: 14
5+
# Label requiring a response
6+
responseRequiredLabel: waiting-for-response
7+
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
8+
closeComment: >
9+
This issue has been automatically closed because there has been no response
10+
to our request for more information from the original author.
11+
You can always reopen the issue if needed.

‎.github/workflows/ci.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: CI
2+
3+
# Triggers the workflow on push or pull request events
4+
on: [push, pull_request]
5+
6+
jobs:
7+
bats-test:
8+
strategy:
9+
matrix:
10+
os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11]
11+
12+
runs-on: ${{ matrix.os }}
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
- name: Install greadlink
17+
if: startsWith(runner.os, 'macOS')
18+
run: brew install coreutils
19+
- name: Install parallel
20+
if: startsWith(runner.os, 'macOS')
21+
run: brew install parallel
22+
- name: Test code
23+
run: test/run
24+
25+
build-docs:
26+
runs-on: ubuntu-latest
27+
28+
steps:
29+
- uses: actions/checkout@v4
30+
- name: Set up Python
31+
uses: actions/setup-python@v4
32+
with:
33+
python-version: 3.8
34+
- name: Install docs dependencies
35+
run: python3 -m pip install -r docs/requirements.txt
36+
- name: Build the docs
37+
run: sphinx-build -W -b html docs docs/_build/html
38+
39+
lint:
40+
runs-on: ubuntu-latest
41+
42+
steps:
43+
- uses: actions/checkout@v4
44+
- name: Set up Go
45+
uses: actions/setup-go@v4
46+
with:
47+
go-version: 1.21.0
48+
- name: Set up Python
49+
uses: actions/setup-python@v4
50+
with:
51+
python-version: 3.8
52+
- name: Install shfmt
53+
run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
54+
- name: Install shellcheck
55+
env:
56+
scversion: stable # Or latest, vxx, etc
57+
run: |
58+
wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv "shellcheck-${scversion}/shellcheck"
59+
sudo cp "shellcheck-${scversion}/shellcheck" /usr/bin/
60+
shellcheck --version
61+
- name: Install pre-commit
62+
run: python3 -m pip install -r test/lint-requirements.txt
63+
- name: Run lint
64+
run: ./lint_clean_files.sh

‎.gitignore‎

100755100644
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,10 @@ bats
1515
*.sublime-workspace
1616
*.sublime-project
1717
enabled/*
18+
/enabled
19+
tmp/
20+
21+
# Do not save profiles
22+
profiles/*
23+
# apart from the default one
24+
!profiles/default.bash_it

‎.gitmodules‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
[submodule "test_lib/bats-core"]
22
path = test_lib/bats-core
33
url = https://github.com/bats-core/bats-core
4+
branch = tags/v1.2.0
45
[submodule "test_lib/bats-support"]
56
path = test_lib/bats-support
6-
url = https://github.com/ztombol/bats-support
7+
url = https://github.com/bats-core/bats-support
8+
branch = tags/v0.3.0
79
[submodule "test_lib/bats-assert"]
810
path = test_lib/bats-assert
9-
url = https://github.com/ztombol/bats-assert
11+
url = https://github.com/bats-core/bats-assert
12+
branch = tags/v2.0.0
1013
[submodule "test_lib/bats-file"]
1114
path = test_lib/bats-file
12-
url = https://github.com/ztombol/bats-file
15+
url = https://github.com/bats-core/bats-file
16+
branch = tags/v0.3.0

0 commit comments

Comments
 (0)