Merge branch 'master' into completion-sqpmap

Author: seefood

.editorconfig

@@ -1,5 +1,6 @@
 *.sh text eol=lf
 *.bash text eol=lf
+*.bats text eol=lf
 
 # Docs allow trailing whitespaces
 *.md whitespace=-blank-at-eol

.gitattributes

@@ -0,0 +1,85 @@
+name: 🐛 Bug report
+title: "[Bug]: "
+description: Create a bug report to help us improve
+labels: "bug:general"
+body:
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Tell us what should happen.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: Tell us what happens instead of the expected behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: Tell us how it could be fixed at your glance.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Context
+      description: >
+        How has this issue affected you? What are you trying to accomplish?
+        Providing context helps us come up with a solution that is most useful in the real world.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      description: >
+        Provide a link to a live example, or an unambiguous set of steps to reproduce this bug. Include code to reproduce, if relevant.
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Bash-it version
+      placeholder: "How to get: bash-it version"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: List of enabled plugins, themes and aliases
+      placeholder: "How to get: bash-it show plugins|themes|aliases (it is not a pipe)"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Bash version
+      placeholder: "How to get: bash --version"
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Operating system and version
+      placeholder: "How to get: neofetch (or another command)"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: "bash-it doctor output"
+      value: |
+        ```
+        # How to get: bash-it doctor
+        ```
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Your ~/.bashrc
+      value: |
+        ```bash
+        # How to get: cat ~/.bashrc
+        ```
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Notes
+      description: >
+        Provide any extra details here.

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Libera chat
+    url: https://web.libera.chat/?channel=#bash-it
+    about: You can ask and answer questions here

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,34 @@
+name: 💡 Feature request
+title: "[Feature]: "
+description: Suggest an idea for this project
+labels: "feature request"
+body:
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: Tell us how your feature should work.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Current behavior
+      description: Explain the difference your feature will have from current behavior.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Possible solution
+      description: Tell us how it could be fixed at your glance.
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Context
+      description: >
+        How has this issue affected you? What are you trying to accomplish?
+        Providing context helps us come up with a solution that is most useful in the real world.
+  - type: textarea
+    attributes:
+      label: Notes
+      description: >
+        Provide any extra details here.

.github/ISSUE_TEMPLATE/config.yml

@@ -7,12 +7,12 @@ jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11]
+        os: [ubuntu-20.04, ubuntu-22.04, macos-12, macos-11]
 
     runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Install greadlink
       if: startsWith(runner.os, 'macOS')
       run: brew install coreutils
@@ -26,9 +26,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install docs dependencies
@@ -40,19 +40,24 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Set up Go
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v4
       with:
-        go-version: 1.17
+        go-version: 1.21.0
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v4
       with:
         python-version: 3.8
     - name: Install shfmt
-      run: GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
+      run: go install mvdan.cc/sh/v3/cmd/shfmt@latest
     - name: Install shellcheck
-      run: brew install shellcheck
+      env:
+        scversion: stable # Or latest, vxx, etc
+      run: |
+        wget -qO- "https://github.com/koalaman/shellcheck/releases/download/${scversion?}/shellcheck-${scversion?}.linux.x86_64.tar.xz" | tar -xJv "shellcheck-${scversion}/shellcheck"
+        sudo cp "shellcheck-${scversion}/shellcheck" /usr/bin/
+        shellcheck --version
     - name: Install pre-commit
       run: python3 -m pip install -r test/lint-requirements.txt
     - name: Run lint

.github/ISSUE_TEMPLATE/feature_request.md

@@ -19,7 +19,6 @@ repos:
     hooks:
       - id: git-check  # Configure in .gitattributes
       - id: shellcheck
-        exclude: ".bats$"
       - id: shfmt
         exclude: ".bats$"
   - repo: https://github.com/Lucas-C/pre-commit-hooks
@@ -38,10 +37,9 @@ repos:
         types: [file]
       - id: dot-bash
         name: Check .bash files against bash-it requirements
-        exclude: "test/test_helper.bash"
         entry: ./hooks/dot-bash.sh
         language: system
-        files: "\\.bash$"
+        files: "\\.ba[ts][sh]$"
         types: [file]
       - id: clean-files-txt
         name: Check that clean_files.txt is sorted alphabetically.

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'the silver searcher (ag) aliases'
 
 ## Summary for args to less:

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'ansible abbreviations'
 
 alias ans=ansible

.gitignore

@@ -6,10 +6,8 @@ cite 'about-alias'
 about-alias 'Apt and dpkg aliases for Ubuntu and Debian distros.'
 
 # set apt aliases
-function _set_pkg_aliases()
-{
-	if _command_exists apt
-	then
+function _set_pkg_aliases() {
+	if _command_exists apt; then
 		alias apts='apt-cache search'
 		alias aptshow='apt-cache show'
 		alias aptinst='sudo apt-get install -V'

.pre-commit-config.yaml

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Atom.io editor abbreviations'
 
 alias a='atom'

aliases/available/ag.aliases.bash

@@ -1,4 +1,4 @@
-cite about-alias
+# shellcheck shell=bash
 about-alias 'Aliases for the bash-it command (these aliases are automatically included with the "general" aliases)'
 
 # Common misspellings of bash-it

aliases/available/ansible.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'puppet bolt aliases'
 
 # Aliases

aliases/available/apt.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'ruby bundler'
 
 # Bundler Commands

aliases/available/atom.aliases.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite 'about-alias'
 about-alias 'xclip shortcuts'
 
 alias pbcopy="xclip -selection clipboard"

aliases/available/bash-it.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'common composer abbreviations'
 
 # Aliases

aliases/available/bolt.aliases.bash

@@ -1,23 +1,19 @@
-#!/bin/bash
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Curl aliases for convenience.'
 
 # set apt aliases
-function _set_pkg_aliases()
-{
-	if _command_exists curl
-	then
+function _set_pkg_aliases() {
+	if _command_exists curl; then
 		# follow redirects
-                alias cl='curl -L'
-                # follow redirects, download as original name
-                alias clo='curl -L -O'
-                # follow redirects, download as original name, continue
-                alias cloc='curl -L -C - -O'
-                # follow redirects, download as original name, continue, retry 5 times
-                alias clocr='curl -L -C - -O --retry 5'
-                # follow redirects, fetch banner
-                alias clb='curl -L -I'
+		alias cl='curl -L'
+		# follow redirects, download as original name
+		alias clo='curl -L -O'
+		# follow redirects, download as original name, continue
+		alias cloc='curl -L -C - -O'
+		# follow redirects, download as original name, continue, retry 5 times
+		alias clocr='curl -L -C - -O --retry 5'
+		# follow redirects, fetch banner
+		alias clb='curl -L -I'
 		# see only response headers from a get request
 		alias clhead='curl -D - -so /dev/null'
 	fi

aliases/available/bundler.aliases.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite 'about-alias'
 about-alias 'dnf aliases for fedora 22+ distros'
 
 alias dnfl="dnf list"            # List packages

aliases/available/clipboard.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'docker-compose abbreviations'
 
 alias dco="docker-compose"