Skip to content

Commit 9a2417c

Browse files
authored
Merge branch 'master' into completion-sqpmap
2 parents c4e4846 + ab9354b commit 9a2417c

File tree

169 files changed

+4446
-2601
lines changed

Some content is hidden

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

169 files changed

+4446
-2601
lines changed

.editorconfig

100755100644
File mode changed.

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.sh text eol=lf
22
*.bash text eol=lf
3+
*.bats text eol=lf
34

45
# Docs allow trailing whitespaces
56
*.md whitespace=-blank-at-eol

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

.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.md

Lines changed: 0 additions & 23 deletions
This file was deleted.
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/workflows/ci.yml

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ jobs:
77
bats-test:
88
strategy:
99
matrix:
10-
os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11]
10+
os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11]
1111

1212
runs-on: ${{ matrix.os }}
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v4
1616
- name: Install greadlink
1717
if: startsWith(runner.os, 'macOS')
1818
run: brew install coreutils
@@ -26,9 +26,9 @@ jobs:
2626
runs-on: ubuntu-latest
2727

2828
steps:
29-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3030
- name: Set up Python
31-
uses: actions/setup-python@v2
31+
uses: actions/setup-python@v4
3232
with:
3333
python-version: 3.8
3434
- name: Install docs dependencies
@@ -40,19 +40,24 @@ jobs:
4040
runs-on: ubuntu-latest
4141

4242
steps:
43-
- uses: actions/checkout@v2
43+
- uses: actions/checkout@v4
4444
- name: Set up Go
45-
uses: actions/setup-go@v2
45+
uses: actions/setup-go@v4
4646
with:
47-
go-version: 1.17
47+
go-version: 1.21.0
4848
- name: Set up Python
49-
uses: actions/setup-python@v2
49+
uses: actions/setup-python@v4
5050
with:
5151
python-version: 3.8
5252
- name: Install shfmt
53-
run: GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
53+
run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
5454
- name: Install shellcheck
55-
run: brew 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
5661
- name: Install pre-commit
5762
run: python3 -m pip install -r test/lint-requirements.txt
5863
- name: Run lint

.gitignore

100755100644
File mode changed.

.pre-commit-config.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ repos:
1919
hooks:
2020
- id: git-check # Configure in .gitattributes
2121
- id: shellcheck
22-
exclude: ".bats$"
2322
- id: shfmt
2423
exclude: ".bats$"
2524
- repo: https://github.com/Lucas-C/pre-commit-hooks
@@ -38,10 +37,9 @@ repos:
3837
types: [file]
3938
- id: dot-bash
4039
name: Check .bash files against bash-it requirements
41-
exclude: "test/test_helper.bash"
4240
entry: ./hooks/dot-bash.sh
4341
language: system
44-
files: "\\.bash$"
42+
files: "\\.ba[ts][sh]$"
4543
types: [file]
4644
- id: clean-files-txt
4745
name: Check that clean_files.txt is sorted alphabetically.

0 commit comments

Comments
 (0)