Merge branch 'master' into bats-nounset

Author: seefood

.github/workflows/ci.yml

@@ -7,12 +7,12 @@ jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-18.04, macos-10.15, macos-11]
+        os: [ubuntu-24.04, macos-14]
 
     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,20 +40,43 @@ 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
       run: ./lint_clean_files.sh
+
+  lint-differential:
+    runs-on: ubuntu-latest
+
+    permissions:
+      security-events: write
+
+    steps:
+      - name: Repository checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - id: ShellCheck
+        name: Differential ShellCheck
+        uses: redhat-plumbers-in-action/differential-shellcheck@v5
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -22,3 +22,5 @@ tmp/
 profiles/*
 # apart from the default one
 !profiles/default.bash_it
+
+/vendor/github.com/nojhan/liquidprompt

.gitmodules

@@ -1,16 +1,16 @@
 [submodule "test_lib/bats-core"]
 	path = test_lib/bats-core
 	url = https://github.com/bats-core/bats-core
-	branch = tags/v1.2.0
+	branch = tags/v1.9.0
 [submodule "test_lib/bats-support"]
 	path = test_lib/bats-support
 	url = https://github.com/bats-core/bats-support
 	branch = tags/v0.3.0
 [submodule "test_lib/bats-assert"]
 	path = test_lib/bats-assert
 	url = https://github.com/bats-core/bats-assert
-	branch = tags/v2.0.0
+	branch = tags/v2.1.0
 [submodule "test_lib/bats-file"]
 	path = test_lib/bats-file
 	url = https://github.com/bats-core/bats-file
-	branch = tags/v0.3.0
+	branch = tags/v0.4.0

.pre-commit-config.yaml

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

aliases/available/dnf.aliases.bash

@@ -1,17 +1,19 @@
 # shellcheck shell=bash
 about-alias 'dnf aliases for fedora 22+ distros'
 
-alias dnfl="dnf list"            # List packages
-alias dnfli="dnf list installed" # List installed packages
-alias dnfgl="dnf grouplist"      # List package groups
-alias dnfmc="dnf makecache"      # Generate metadata cache
-alias dnfp="dnf info"            # Show package information
-alias dnfs="dnf search"          # Search package
+if _command_exists dnf; then
+	alias dnfp="dnf info"            # Show package information
+	alias dnfl="dnf list"            # List packages
+	alias dnfli="dnf list installed" # List installed packages
+	alias dnfgl="dnf grouplist"      # List package groups
+	alias dnfmc="dnf makecache"      # Generate metadata cache
+	alias dnfs="dnf search"          # Search package
 
-alias dnfu="sudo dnf upgrade"       # Upgrade package
-alias dnfi="sudo dnf install"       # Install package
-alias dnfri='sudo dnf reinstall'    # Reinstall package
-alias dnfgi="sudo dnf groupinstall" # Install package group
-alias dnfr="sudo dnf remove"        # Remove package
-alias dnfgr="sudo dnf groupremove"  # Remove package group
-alias dnfc="sudo dnf clean all"     # Clean cache
+	alias dnfi="sudo dnf install"       # Install package
+	alias dnfr="sudo dnf remove"        # Remove package
+	alias dnfu="sudo dnf upgrade"       # Upgrade package
+	alias dnfc="sudo dnf clean all"     # Clean cache
+	alias dnfri="sudo dnf reinstall"    # Reinstall package
+	alias dnfgi="sudo dnf groupinstall" # Install package group
+	alias dnfgr="sudo dnf groupremove"  # Remove package group
+fi

aliases/available/general.aliases.bash

@@ -34,7 +34,7 @@ fi
 alias c='clear'
 alias cls='clear'
 
-alias edit='${EDITOR:-${ALTERNATE_EDITOR?}}'
+alias edit='${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
 alias pager='${PAGER:=less}'
 
 alias q='exit'
@@ -50,11 +50,12 @@ alias ipy='ipython'
 
 alias piano='pianobar'
 
-alias ..='cd ..'         # Go up one directory
-alias cd..='cd ..'       # Common misspelling for going up one directory
-alias ...='cd ../..'     # Go up two directories
-alias ....='cd ../../..' # Go up three directories
-alias -- -='cd -'        # Go back
+alias ..='cd ..'                     # Go up one directory
+alias cd..='cd ..'                   # Common misspelling for going up one directory
+alias ...='cd ../..'                 # Go up two directories
+alias ....='cd ../../..'             # Go up three directories
+alias -- -='cd -'                    # Go back
+alias dow='cd /home/$USER/Downloads' # Go to the Downloads directory
 
 # Shell History
 alias h='history'
@@ -68,13 +69,12 @@ fi
 alias md='mkdir -p'
 alias rd='rmdir'
 
+# Remove
+alias rmrf='rm -rf'
+
 # Shorten extract
 alias xt='extract'
 
-# sudo editors
-alias svim='sudo ${VISUAL:-vim}'
-alias snano='sudo nano'
-
 # Display whatever file is regular file or folder
 function catt() {
 	for i in "$@"; do

aliases/available/git-omz.aliases.bash

@@ -0,0 +1,34 @@
+# shellcheck shell=bash
+cite 'about-alias'
+about-alias 'git aliases from oh-my-zsh (incompatible with regular git aliases option)'
+
+if _bash-it-component-item-is-enabled aliases git; then
+	_log_warning "git-omz aliases are incompatible with regular git aliases"
+	return 1
+fi
+
+# Load after regular git aliases
+# BASH_IT_LOAD_PRIORITY: 160
+
+# Setup git version
+read -ra git_version_arr <<< "$(git version 2> /dev/null)"
+# shellcheck disable=SC2034
+git_version="${git_version_arr[2]}"
+
+# Setup is-at-least
+function is-at-least {
+	local expected_version=$1
+	local actual_version=$2
+	local versions
+
+	printf -v versions '%s\n%s' "$expected_version" "$actual_version"
+	[[ $versions = "$(sort -V <<< "$versions")" ]]
+}
+
+# Setup git_current_branch
+function git_current_branch {
+	_git-branch
+}
+
+# shellcheck disable=SC1090
+source "${BASH_IT}"/vendor/github.com/ohmyzsh/ohmyzsh/plugins/git/git.plugin.zsh

aliases/available/git.aliases.bash

@@ -1,22 +1,33 @@
 # shellcheck shell=bash
 about-alias 'common git abbreviations'
 
+# We can use this variable to make sure that we don't accidentally clash with git-zsh aliases
+if _bash-it-component-item-is-enabled aliases git-omz; then
+	_log_warning "The aliases from 'git' and from 'git-omz' conflict with each other; please only enable one."
+	return 1
+fi
+
 alias g='git'
 alias get='git'
+alias got='git '
 
 # add
 alias ga='git add'
 alias gall='git add -A'
 alias gap='git add -p'
+alias gav='git add -v'
 
 # branch
 alias gb='git branch'
-alias gbD='git branch -D'
-alias gba='git branch -a'
+alias gba='git branch --all'
 alias gbd='git branch -d'
-alias gbm='git branch -m'
+alias gbD='git branch -D'
+alias gbl='git branch --list'
+alias gbla='git branch --list --all'
+alias gblr='git branch --list --remotes'
+alias gbm='git branch --move'
+alias gbr='git branch --remotes'
 alias gbt='git branch --track'
-alias gdel='git branch -D'
 
 # for-each-ref
 alias gbc='git for-each-ref --format="%(authorname) %09 %(if)%(HEAD)%(then)*%(else)%(refname:short)%(end) %09 %(creatordate)" refs/remotes/ --sort=authorname DESC' # FROM https://stackoverflow.com/a/58623139/10362396
@@ -27,6 +38,9 @@ alias gca='git commit -v -a'
 alias gcaa='git commit -a --amend -C HEAD' # Add uncommitted and unstaged changes to the last commit
 alias gcam='git commit -v -am'
 alias gcamd='git commit --amend'
+alias gc!='git commit -v --amend'
+alias gca!='git commit -v -a --amend'
+alias gcn!='git commit -v --amend --no-edit'
 alias gcm='git commit -v -m'
 alias gci='git commit --interactive'
 alias gcsam='git commit -S -am'
@@ -74,6 +88,8 @@ alias ggup='git log --branches --not --remotes --no-walk --decorate --oneline' #
 alias gll='git log --graph --pretty=oneline --abbrev-commit'
 alias gnew='git log HEAD@{1}..HEAD@{0}' # Show commits since last pull, see http://blogs.atlassian.com/2014/10/advanced-git-aliases/
 alias gwc='git whatchanged'
+alias ghist='git log --pretty=format:'\''%h %ad | %s%d [%an]'\'' --graph --date=short'                                          # Use it to be fast and without color.
+alias gprogress='git log --pretty=format:'\''%C(yellow)%h %Cblue%ad %Creset%s%Cgreen [%cn] %Cred%d'\'' --decorate --date=short' #Usually use "git progress" in the file .gitconfig. The new alias from Git friends will be truly welcome.
 
 # ls-files
 alias gu='git ls-files . --exclude-standard --others' # Show untracked files
@@ -92,6 +108,9 @@ fi
 
 # merge
 alias gm='git merge'
+alias gma='git merge --abort'
+alias gmc='git merge --continue'
+alias gms='git merge --squash'
 
 # mv
 alias gmv='git mv'
@@ -102,7 +121,8 @@ alias gpatch='git format-patch -1'
 # push
 alias gp='git push'
 alias gpd='git push --delete'
-alias gpf='git push --force'
+alias gpf='git push --force-with-lease'
+alias gpff='git push --force'
 alias gpo='git push origin HEAD'
 alias gpom='git push origin $(get_default_branch)'
 alias gpu='git push --set-upstream'
@@ -112,6 +132,7 @@ alias gpuoc='git push --set-upstream origin $(git symbolic-ref --short HEAD)'
 
 # pull
 alias gl='git pull'
+alias glp='git pull --prune'
 alias glum='git pull upstream $(get_default_branch)'
 alias gpl='git pull'
 alias gpp='git pull && git push'
@@ -124,17 +145,21 @@ alias grv='git remote -v'
 
 # rm
 alias grm='git rm'
+alias grmc='git rm --cached' # Removes the file only from the Git repository, but not from the filesystem. This is useful to undo some of the changes you made to a file before you commit it.
 
 # rebase
 alias grb='git rebase'
+alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
-alias grm='git rebase $(get_default_branch)'
-alias grmi='git rebase $(get_default_branch) -i'
-alias grma='GIT_SEQUENCE_EDITOR=: git rebase  $(get_default_branch) -i --autosquash'
+alias grbm='git rebase $(get_default_branch)'
+alias grbmi='git rebase $(get_default_branch) --interactive'
+alias grbma='GIT_SEQUENCE_EDITOR=: git rebase $(get_default_branch) --interactive --autosquash'
 alias gprom='git fetch origin $(get_default_branch) && git rebase origin/$(get_default_branch) && git update-ref refs/heads/$(get_default_branch) origin/$(get_default_branch)' # Rebase with latest remote
 
 # reset
-alias gus='git reset HEAD'
+alias gus='git reset HEAD' # read as: 'git unstage'
+alias grh='git reset'      # equivalent to: git reset HEAD
+alias grh!='git reset --hard'
 alias gpristine='git reset --hard && git clean -dfx'
 
 # status
@@ -147,6 +172,8 @@ alias gsl='git shortlog -sn'
 
 # show
 alias gsh='git show'
+alias gshn='git show --name-only'
+alias gshns='git show --name-status'
 
 # svn
 alias gsd='git svn dcommit'
@@ -199,9 +226,6 @@ function gdv() {
 }
 
 function get_default_branch() {
-	if git branch | grep -q '^. main\s*$'; then
-		echo main
-	else
-		echo master
-	fi
+	branch=$(git symbolic-ref refs/remotes/origin/HEAD)
+	${branch#refs/remotes/origin/}
 }

aliases/available/homebrew.aliases.bash

@@ -1,13 +1,15 @@
 # shellcheck shell=bash
 about-alias 'Some aliases for Homebrew'
 
-alias bup='brew update && brew upgrade'
-alias bout='brew outdated'
-alias bin='brew install'
-alias brm='brew uninstall'
-alias bcl='brew cleanup'
-alias bls='brew list'
-alias bsr='brew search'
-alias binf='brew info'
-alias bdr='brew doctor'
-alias bed='brew edit'
+if _command_exists brew; then
+	alias bed='brew edit'
+	alias bls='brew list'
+	alias bsr='brew search'
+	alias bdr='brew doctor'
+	alias bin='brew install'
+	alias bcl='brew cleanup'
+	alias brm='brew uninstall'
+	alias bout='brew outdated'
+	alias binf='brew info'
+	alias bup='brew update && brew upgrade'
+fi