Merge branch 'master' into alias/general

Author: seefood

.github/workflows/ci.yml

@@ -7,7 +7,7 @@ jobs:
   bats-test:
     strategy:
       matrix:
-        os: [ubuntu-20.04, ubuntu-22.04, macos-14, macos-15]
+        os: [ubuntu-20.04, ubuntu-24.04, macos-14]
 
     runs-on: ${{ matrix.os }}
 
@@ -62,3 +62,21 @@ jobs:
       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 }}

.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

@@ -35,6 +35,13 @@ if _command_exists pianobar; then
 	alias piano='pianobar'
 fi
 
+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'
 
@@ -47,6 +54,9 @@ fi
 alias md='mkdir -p'
 alias rd='rmdir'
 
+# Remove
+alias rmrf='rm -rf'
+
 # Shorten extract
 alias xt='extract'
 

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

clean_files.txt

@@ -17,9 +17,11 @@
 # root directories
 #
 aliases/
+completion/
 docs/
 hooks/
 lib/
+plugins/
 scripts/
 test/
 
@@ -31,118 +33,6 @@ clean_files.txt
 install.sh
 lint_clean_files.sh
 
-# completions
-#
-completion/available/aliases.completion.bash
-completion/available/apm.completion.bash
-completion/available/awless.completion.bash
-completion/available/awscli.completion.bash
-completion/available/bash-it.completion.bash
-completion/available/brew.completion.bash
-completion/available/bundler.completion.bash
-completion/available/cargo.completion.bash
-completion/available/composer.completion.bash
-completion/available/conda.completion.bash
-completion/available/consul.completion.bash
-completion/available/dart.completion.bash
-completion/available/django.completion.bash
-completion/available/dmidecode.completion.bash
-completion/available/docker-machine.completion.bash
-completion/available/docker.completion.bash
-completion/available/dotnet.completion.bash
-completion/available/export.completion.bash
-completion/available/flutter.completion.bash
-completion/available/gcloud.completion.bash
-completion/available/gem.completion.bash
-completion/available/git.completion.bash
-completion/available/github-cli.completion.bash
-completion/available/go.completion.bash
-completion/available/helm.completion.bash
-completion/available/jboss5.completion.bash
-completion/available/jboss7.completion.bash
-completion/available/jungle.completion.bash
-completion/available/knife.completion.bash
-completion/available/kontena.completion.bash
-completion/available/kubectl.completion.bash
-completion/available/laravel.completion.bash
-completion/available/lerna.completion.bash
-completion/available/minikube.completion.bash
-completion/available/ngrok.completion.bash
-completion/available/notify-send.completion.bash
-completion/available/npm.completion.bash
-completion/available/packer.completion.bash
-completion/available/pip.completion.bash
-completion/available/pip3.completion.bash
-completion/available/pipenv.completion.bash
-completion/available/pipx.completion.bash
-completion/available/rustup.completion.bash
-completion/available/salt.completion.bash
-completion/available/sdkman.completion.bash
-completion/available/system.completion.bash
-completion/available/vault.completion.bash
-completion/available/vuejs.completion.bash
-completion/available/wpscan.completion.bash
-completion/available/yarn.completion.bash
-
-# plugins
-#
-plugins/available/alias-completion.plugin.bash
-plugins/available/autojump.plugin.bash
-plugins/available/base.plugin.bash
-plugins/available/basher.plugin.bash
-plugins/available/battery.plugin.bash
-plugins/available/blesh.plugin.bash
-plugins/available/browser.plugin.bash
-plugins/available/cmd-returned-notify.plugin.bash
-plugins/available/colors.plugin.bash
-plugins/available/direnv.plugin.bash
-plugins/available/dirs.plugin.bash
-plugins/available/docker-compose.plugin.bash
-plugins/available/docker-machine.plugin.bash
-plugins/available/extract.plugin.bash
-plugins/available/gif.plugin.bash
-plugins/available/git-subrepo.plugin.bash
-plugins/available/git.plugin.bash
-plugins/available/go.plugin.bash
-plugins/available/goenv.plugin.bash
-plugins/available/gradle.plugin.bash
-plugins/available/history-eternal.plugin.bash
-plugins/available/history-search.plugin.bash
-plugins/available/history-substring-search.plugin.bash
-plugins/available/history.plugin.bash
-plugins/available/hub.plugin.bash
-plugins/available/java.plugin.bash
-plugins/available/jekyll.plugin.bash
-plugins/available/jgitflow.plugin.bash
-plugins/available/jump.plugin.bash
-plugins/available/latex.plugin.bash
-plugins/available/less-pretty-cat.plugin.bash
-plugins/available/man.plugin.bash
-plugins/available/nginx.plugin.bash
-plugins/available/node.plugin.bash
-plugins/available/nodenv.plugin.bash
-plugins/available/osx-timemachine.plugin.bash
-plugins/available/osx.plugin.bash
-plugins/available/percol.plugin.bash
-plugins/available/plenv.plugin.bash
-plugins/available/projects.plugin.bash
-plugins/available/proxy.plugin.bash
-plugins/available/pyenv.plugin.bash
-plugins/available/python.plugin.bash
-plugins/available/rbenv.plugin.bash
-plugins/available/ruby.plugin.bash
-plugins/available/textmate.plugin.bash
-plugins/available/todo.plugin.bash
-plugins/available/url.plugin.bash
-plugins/available/xterm.plugin.bash
-plugins/available/zoxide.plugin.bash
-
-# tests
-#
-test/completion/aliases.completion.bats
-test/run
-test/test_helper.bash
-
 # themes
 #
 themes/90210
@@ -160,10 +50,19 @@ themes/brainy
 themes/brunton
 themes/candy
 themes/clean
+themes/codeword
+themes/cooperkid
+themes/cupcake
+themes/doubletime
+themes/doubletime_multiline
+themes/doubletime_multiline_pyonly
+themes/dulcie
+themes/duru
 themes/easy
 themes/elixr
 themes/essential
 themes/githelpers.theme.bash
+themes/gitline
 themes/inretio
 themes/lambda
 themes/modern
@@ -174,7 +73,7 @@ themes/pete
 themes/powerline
 themes/pure
 themes/purity
-
+themes/rjorgenson
 
 # vendor init files
 #

completion/available/aliases.completion.bash

@@ -40,6 +40,24 @@ function _bash-it-component-completion-callback-on-init-aliases() {
 		line="${line#alias -- }"
 		line="${line#alias }"
 		alias_name="${line%%=*}"
+
+		# Skip aliases not added by this script that already have completion functions.
+		# This allows users to define their own alias completion functions.
+		# For aliases added by this script, we do want to replace them in case the
+		# alias getting the completion added has changed.
+		if complete -p "$alias_name" &> /dev/null; then
+			# Get the -F argument from the existing completion for this alias.
+			aliasCommandFunction=$(complete -p "$alias_name" | rev | cut -d " " -f 2 | rev)
+			# Check if aliasCommandFunction starts with our namespace.
+			if [[ "$aliasCommandFunction" != "_${namespace}::"* ]]; then
+				continue
+			fi
+
+			# Remove existing completion. It will be replaced by the new one. We need to
+			# delete it in case the new alias does not support having completion added.
+			complete -r "$alias_name"
+		fi
+
 		alias_defn="${line#*=\'}" # alias definition
 		alias_defn="${alias_defn%\'}"
 		alias_cmd="${alias_defn%%[[:space:]]*}" # first word of alias
@@ -71,13 +89,22 @@ function _bash-it-component-completion-callback-on-init-aliases() {
 		fi
 		new_completion="$(complete -p "$alias_cmd" 2> /dev/null)"
 
-		# create a wrapper inserting the alias arguments if any
-		if [[ -n $alias_args ]]; then
-			compl_func="${new_completion/#* -F /}"
-			compl_func="${compl_func%% *}"
-			# avoid recursive call loops by ignoring our own functions
-			if [[ "${compl_func#_"$namespace"::}" == "$compl_func" ]]; then
-				compl_wrapper="_${namespace}::${alias_name}"
+		compl_func="${new_completion/#* -F /}"
+		compl_func="${compl_func%% *}"
+		# avoid recursive call loops by ignoring our own functions
+		if [[ "${compl_func#_"$namespace"::}" == "$compl_func" ]]; then
+			compl_wrapper="_${namespace}::${alias_name}"
+
+			if [[ -z $alias_args ]]; then
+				# Create a wrapper without arguments.
+				# This allows identifying the completions added by this script on reload.
+				echo "function $compl_wrapper {
+				$compl_func \"\$@\"
+				}" >> "$tmp_file"
+			else
+				# Create a wrapper inserting the alias arguments
+				# The use of printf on alias_arg_words is needed to ensure each element of
+				# the array is quoted. E.X. (one two three) -> ('one' 'two' 'three')
 				echo "function $compl_wrapper {
                         local compl_word=\${2?}
                         local prec_word=\${3?}
@@ -89,14 +116,14 @@ function _bash-it-component-completion-callback-on-init-aliases() {
                             prec_word=\${prec_word#* }
                         fi
                         (( COMP_CWORD += ${#alias_arg_words[@]} ))
-                        COMP_WORDS=(\"$alias_cmd\" \"${alias_arg_words[*]}\" \"\${COMP_WORDS[@]:1}\")
+                        COMP_WORDS=(\"$alias_cmd\" $(printf "%q " "${alias_arg_words[@]}") \"\${COMP_WORDS[@]:1}\")
                         (( COMP_POINT -= \${#COMP_LINE} ))
                         COMP_LINE=\${COMP_LINE/$alias_name/$alias_cmd $alias_args}
                         (( COMP_POINT += \${#COMP_LINE} ))
                         \"$compl_func\" \"$alias_cmd\" \"\$compl_word\" \"\$prec_word\"
                     }" >> "$tmp_file"
-				new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
 			fi
+			new_completion="${new_completion/ -F $compl_func / -F $compl_wrapper }"
 		fi
 
 		# replace completion trigger by alias