Merge pull request #2306 from seefood/ira/pre-release-nitpicks

Author: seefood

aliases/available/general.aliases.bash

@@ -50,12 +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 dow='cd /home/$USER/Downloads' # Go to the Downloads directory
+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/Downloads' # Go to the Downloads directory
 
 # Shell History
 alias h='history'

aliases/available/git.aliases.bash

@@ -9,7 +9,7 @@ fi
 
 alias g='git'
 alias get='git'
-alias got='git '
+alias got='git'
 
 # add
 alias ga='git add'
@@ -111,6 +111,7 @@ alias gm='git merge'
 alias gma='git merge --abort'
 alias gmc='git merge --continue'
 alias gms='git merge --squash'
+alias gmt='git mergetool'
 
 # mv
 alias gmv='git mv'

aliases/available/laravel.aliases.bash

@@ -3,7 +3,14 @@ about-alias 'laravel artisan abbreviations'
 
 # A list of useful laravel aliases
 
-alias laravel='${HOME?}/.composer/vendor/bin/laravel'
+if [[ -x "${HOME?}/.config/composer/vendor/bin/laravel" ]]; then
+	alias laravel='${HOME?}/.config/composer/vendor/bin/laravel'
+elif [[ -x "${HOME?}/.composer/vendor/bin/laravel" ]]; then
+	alias laravel='${HOME?}/.composer/vendor/bin/laravel'
+else
+	return
+fi
+
 # asset
 alias a:apub='php artisan asset:publish'
 

aliases/available/terraform.aliases.bash

@@ -1,10 +1,22 @@
 # shellcheck shell=bash
-about-alias 'Aliases for Terraform and Terragrunt'
+about-alias 'Aliases for Terraform/OpenTofu and Terragrunt'
 
-alias tf='terraform'
-alias tfi='tf init'
-alias tfv='terraform validate'
-alias tfp='terraform plan'
-alias tfa='terraform apply'
-alias tfd='terraform destroy'
-alias tfw='terraform workspace'
+if _command_exists terraform; then
+	alias tf='terraform'
+elif _command_exists tofu; then
+	alias tf='tofu'
+fi
+
+if _command_exists tf; then
+	alias tfa='tf apply'
+	alias tfp='tf plan'
+	alias tfd='tf destroy'
+	alias tfv='tf validate'
+	alias tfi='tf init'
+	alias tfo='tf output'
+	alias tfr='tf refresh'
+	alias tfw='tf workspace'
+	alias tfae='tf apply -auto-approve'
+	alias tfpa='tf plan -out=tfplan && tf apply tfplan'
+	alias tfpaf='tf plan -out=tfplan && tf apply -auto-approve tfplan'
+fi

completion/available/terraform.completion.bash

@@ -1,10 +1,19 @@
 # shellcheck shell=bash
 
-# Make sure terraform is installed
-_command_exists terraform || return
+if _command_exists terraform; then
 
-# Don't handle completion if it's already managed
-complete -p terraform &> /dev/null && return
+	# Don't handle completion if it's already managed
+	complete -p terraform &> /dev/null && return
 
-# Terraform completes itself
-complete -C terraform terraform
+	# Terraform completes itself
+	complete -C terraform terraform
+
+elif _command_exists tofu; then
+
+	# Don't handle completion if it's already managed
+	complete -p tofu &> /dev/null && return
+
+	# OpenTofu completes itself
+	complete -C tofu tofu
+
+fi