Merge pull request #2047 from gaelicWizard/alias/shfmt

Aliases: lint the entire folder

aliases/available/ag.aliases.bash

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

aliases/available/ansible.aliases.bash

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

aliases/available/apt.aliases.bash

@@ -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'

aliases/available/atom.aliases.bash

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

aliases/available/bash-it.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/bolt.aliases.bash

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

aliases/available/bundler.aliases.bash

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

aliases/available/clipboard.aliases.bash

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

aliases/available/composer.aliases.bash

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

aliases/available/curl.aliases.bash

@@ -1,13 +1,9 @@
-#!/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

aliases/available/dnf.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/docker-compose.aliases.bash

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

aliases/available/docker.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'docker abbreviations'
 
 alias dk='docker'
@@ -19,7 +19,7 @@ case $OSTYPE in
 		;;
 esac
 
-if [ ! -z "$(command ls "${BASH_IT}/enabled/"{[0-9][0-9][0-9]${BASH_IT_LOAD_PRIORITY_SEPARATOR}docker,docker}.plugin.bash 2>/dev/null | head -1)" ]; then
+if _bash-it-component-item-is-enabled plugin docker; then
 	# Function aliases from docker plugin:
 	alias dkrmlc='docker-remove-most-recent-container' # Delete most recent (i.e., last) Docker container
 	alias dkrmall='docker-remove-stale-assets'         # Delete all untagged images and exited containers

aliases/available/emacs.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'emacs editor'
 
 case $OSTYPE in

aliases/available/fuck.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'fuck/please to retry last command with sudo'
 
 # Play nicely with 'thefuck' plugin

aliases/available/general.aliases.bash

@@ -1,12 +1,9 @@
-cite about-alias
+# shellcheck shell=bash
 about-alias 'general aliases'
 
-if ls --color -d . &> /dev/null
-then
-  alias ls="ls --color=auto"
-elif ls -G -d . &> /dev/null
-then
-  alias ls='ls -G'        # Compact view, show colors
+if command ls --color -d . &> /dev/null; then
+	alias ls='ls --color=auto'
+	# BSD `ls` doesn't need an argument (`-G`) when `$CLICOLOR` is set.
 fi
 
 # List directory contents
@@ -17,34 +14,32 @@ alias l='ls -a'
 alias l1='ls -1'
 alias lf='ls -F'
 
-alias _="sudo"
+alias _='sudo'
 
 # Shortcuts to edit startup files
-alias vbrc="vim ~/.bashrc"
-alias vbpf="vim ~/.bash_profile"
+alias vbrc='${VISUAL:-vim} ~/.bashrc'
+alias vbpf='${VISUAL:-vim} ~/.bash_profile'
 
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
-if grep --color=auto "a" "${BASH_IT}/"*.md &> /dev/null
-then
+if command grep --color=auto "a" "${BASH_IT?}"/*.md &> /dev/null; then
 	alias grep='grep --color=auto'
 fi
 
-if _command_exists gshuf
-then
+if _command_exists gshuf; then
 	alias shuf=gshuf
 fi
 
 alias c='clear'
 alias cls='clear'
 
-alias edit="$EDITOR"
-alias pager="$PAGER"
+alias edit='${EDITOR:-${ALTERNATE_EDITOR?}}'
+alias pager='${PAGER:=less}'
 
 alias q='exit'
 
-alias irc="${IRC_CLIENT:=irc}"
+alias irc='${IRC_CLIENT:=irc}'
 
 # Language aliases
 alias rb='ruby'
@@ -65,8 +60,7 @@ alias -- -='cd -'        # Go back
 alias h='history'
 
 # Tree
-if ! _command_exists tree
-then
+if ! _command_exists tree; then
 	alias tree="find . -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'"
 fi
 
@@ -75,16 +69,16 @@ alias md='mkdir -p'
 alias rd='rmdir'
 
 # Shorten extract
-alias xt="extract"
+alias xt='extract'
 
 # sudo editors
-alias svim="sudo vim"
-alias snano="sudo nano"
+alias svim='sudo ${VISUAL:-vim}'
+alias snano='sudo nano'
 
 # Display whatever file is regular file or folder
-catt() {
+function catt() {
 	for i in "$@"; do
-    if [ -d "$i" ]; then
+		if [[ -d "$i" ]]; then
 			ls "$i"
 		else
 			cat "$i"
@@ -98,5 +92,5 @@ catt() {
 # aliases and enable just the ones for Bash-it explicitly:
 # bash-it disable alias general
 # bash-it enable alias bash-it
-# shellcheck source=./bash-it.aliases.bash
+# shellcheck source-path=SCRIPTDIR
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"

aliases/available/git.aliases.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite 'about-alias'
 about-alias 'common git abbreviations'
 
 alias g='git'

aliases/available/gitsvn.aliases.bash

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

aliases/available/heroku.aliases.bash

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

aliases/available/hg.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'mercurial abbreviations'
 
 alias hs='hg status'

aliases/available/homebrew-cask.aliases.bash

@@ -1,7 +1,5 @@
-# Some aliases for Homebrew Cask
-
-cite 'about-alias'
-about-alias 'homebrew-cask abbreviations'
+# shellcheck shell=bash
+about-alias 'Some aliases for Homebrew Cask'
 
 alias bcin='brew cask install'
 alias bcrm='brew cask uninstall'

aliases/available/homebrew.aliases.bash

@@ -1,7 +1,5 @@
-# Some aliases for Homebrew
-
-cite 'about-alias'
-about-alias 'homebrew abbreviations'
+# shellcheck shell=bash
+about-alias 'Some aliases for Homebrew'
 
 alias bup='brew update && brew upgrade'
 alias bout='brew outdated'

aliases/available/homesick.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'homesick aliases'
 
 # Aliases
@@ -19,6 +19,5 @@ alias sikpsh="homesick push dotfiles"
 alias sikrc="homesick rc dotfiles"
 alias sikpth="homesick show_path dotfiles"
 alias sikst="homesick status dotfiles"
-alias siktrk="homesick track $1 dotfiles"
 alias sikulnk="homesick unlink dotfiles"
 alias sikv="homesick version"

aliases/available/jitsu.aliases.bash

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

aliases/available/kubectl.aliases.bash

@@ -1,12 +1,7 @@
-#!/bin/bash
-#
-# -binaryanomaly
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'kubectl aliases'
 
-function _set_pkg_aliases()
-{
+function _set_pkg_aliases() {
 	if _command_exists kubectl; then
 		alias kc='kubectl'
 		alias kcgp='kubectl get pods'

aliases/available/laravel.aliases.bash

@@ -1,9 +1,9 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'laravel artisan abbreviations'
 
 # A list of useful laravel aliases
 
-alias laravel="${HOME}/.composer/vendor/bin/laravel"
+alias laravel='${HOME?}/.composer/vendor/bin/laravel'
 # asset
 alias a:apub='php artisan asset:publish'
 

aliases/available/maven.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'maven abbreviations'
 
 alias mci='mvn clean install'

aliases/available/msys2.aliases.bash

@@ -1,6 +1,4 @@
-#!/bin/bash
-
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'MSYS2 aliases'
 
 LS_COMMON="-hG"
@@ -9,7 +7,7 @@ LS_COMMON="$LS_COMMON -I NTUSER.DAT\* -I ntuser.dat\*"
 
 # alias
 # setup the main ls alias if we've established common args
-test -n "$LS_COMMON" && alias ls="command ls $LS_COMMON"
+alias ls='command ls ${LS_COMMON:-}'
 alias ll="ls -l"
 alias la="ls -a"
 alias lal="ll -a"

aliases/available/node.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'the Node.js environment aliases'
 
 # alias to setup nodejs development environment

aliases/available/npm.aliases.bash

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

aliases/available/osx.aliases.bash

@@ -1,26 +1,26 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'osx-specific aliases'
 
 # Desktop Programs
-alias fireworks="open -a '/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app'"
-alias photoshop="open -a '/Applications/Adobe Photoshop CS3/Adobe Photoshop.app'"
-alias preview="open -a '$PREVIEW'"
-alias xcode="open -a '/Applications/XCode.app'"
-alias filemerge="open -a '/Developer/Applications/Utilities/FileMerge.app'"
-alias safari="open -a safari"
-alias firefox="open -a firefox"
-alias chrome="open -a google\ chrome"
-alias chromium="open -a chromium"
-alias dashcode="open -a dashcode"
+alias fireworks='open -a "/Applications/Adobe Fireworks CS3/Adobe Fireworks CS3.app"'
+alias photoshop='open -a "/Applications/Adobe Photoshop CS3/Adobe Photoshop.app"'
+alias preview='open -a "${PREVIEW?}"'
+alias xcode='open -a "/Applications/XCode.app"'
+alias filemerge='open -a "/Developer/Applications/Utilities/FileMerge.app"'
+alias safari='open -a safari'
+alias firefox='open -a firefox'
+alias chrome='open -a "Google Chrome"'
+alias chromium='open -a chromium'
+alias dashcode='open -a dashcode'
 alias f='open -a Finder '
 alias fh='open -a Finder .'
 alias textedit='open -a TextEdit'
 alias hex='open -a "Hex Fiend"'
 alias skype='open -a Skype'
 alias mou='open -a Mou'
-alias subl='open -a Sublime\ Text'
+alias subl='open -a "Sublime Text"'
 
-if [ -s /usr/bin/firefox ] ; then
+if [[ -s /usr/bin/firefox ]]; then
 	unalias firefox
 fi
 
@@ -37,19 +37,20 @@ alias whotunes='lsof -r 2 -n -P -F n -c iTunes -a -i TCP@`hostname`:3689'
 alias flush='dscacheutil -flushcache'
 
 # Show/hide hidden files (for Mac OS X Mavericks)
-alias showhidden="defaults write com.apple.finder AppleShowAllFiles TRUE"
-alias hidehidden="defaults write com.apple.finder AppleShowAllFiles FALSE"
+alias showhidden='defaults write com.apple.finder AppleShowAllFiles TRUE'
+alias hidehidden='defaults write com.apple.finder AppleShowAllFiles FALSE'
 
 # From http://apple.stackexchange.com/questions/110343/copy-last-command-in-terminal
-alias copyLastCmd='fc -ln -1 | awk '\''{$1=$1}1'\'' ORS='\'''\'' | pbcopy'
+# shellcheck disable=SC2142 # The quoting confuses `shellcheck`...
+alias copyLastCmd="fc -ln -1 | awk '{\$1=\$1}1' ORS='' | pbcopy"
 
 # Use Finder's Quick Look on a file (^C or space to close)
 alias ql='qlmanage -p 2>/dev/null'
 
 # Mute/Unmute the system volume. Plays nice with all other volume settings.
-alias mute="osascript -e 'set volume output muted true'"
-alias unmute="osascript -e 'set volume output muted false'"
+alias mute='osascript -e "set volume output muted true"'
+alias unmute='osascript -e "set volume output muted false"'
 
 # Pin to the tail of long commands for an audible alert after long processes
 ## curl http://downloads.com/hugefile.zip; lmk
-alias lmk="say 'Process complete.'"
+alias lmk='say "Process complete."'

aliases/available/phoenix.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'phoenix abbreviations'
 
 # Phoenix Commands

aliases/available/puppet.aliases.bash

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

aliases/available/pyrocms.aliases.bash

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

aliases/available/rails.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'rails abbreviations'
 
 # Rails Commands

aliases/available/svn.aliases.bash

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

aliases/available/systemd.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'systemd service'
 
 case $OSTYPE in

aliases/available/terraform.aliases.bash

@@ -1,7 +1,5 @@
-# Aliases for Terraform and Terragrunt
-
-cite 'about-alias'
-about-alias 'Terraform abbreviations'
+# shellcheck shell=bash
+about-alias 'Aliases for Terraform and Terragrunt'
 
 alias tf='terraform'
 alias tfv='terraform validate'

aliases/available/terragrunt.aliases.bash

@@ -1,7 +1,5 @@
-# Aliases for Terraform and Terragrunt
-
-cite 'about-alias'
-about-alias 'Terragrunt abbreviations'
+# shellcheck shell=bash
+about-alias 'Aliases for Terraform and Terragrunt'
 
 alias tg='terragrunt'
 alias tgv='terragrunt validate'

aliases/available/textmate.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'textmate abbreviations'
 
 case $OSTYPE in

aliases/available/tmux.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'Tmux terminal multiplexer'
 
 alias txl='tmux ls'

aliases/available/todo.txt-cli.aliases.bash

@@ -1,8 +1,8 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'todo.txt-cli abbreviations'
 
-alias tls="$TODO ls"
-alias ta="$TODO a"
-alias trm="$TODO rm"
-alias tdo="$TODO do"
-alias tpri="$TODO pri"
+alias tls='"${TODO?}" ls'
+alias ta='"${TODO?}" a'
+alias trm='"${TODO?}" rm'
+alias tdo='"${TODO?}" do'
+alias tpri='"${TODO?}" pri'

aliases/available/uuidgen.aliases.bash

@@ -1,4 +1,4 @@
-cite 'uuid-alias'
+# shellcheck shell=bash
 about-alias 'uuidgen aliases'
 
 if _command_exists uuid; then # Linux

aliases/available/vagrant.aliases.bash

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

aliases/available/vault.aliases.bash

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

aliases/available/vim.aliases.bash

@@ -1,5 +1,4 @@
 # shellcheck shell=bash
-cite 'about-alias'
 about-alias 'vim abbreviations'
 
 _command_exists vim || return

aliases/available/yarn.aliases.bash

@@ -1,4 +1,4 @@
-cite 'about-alias'
+# shellcheck shell=bash
 about-alias 'yarn package manager aliases'
 
 # Aliases

clean_files.txt

@@ -16,6 +16,7 @@
 
 # root directories
 #
+aliases/
 docs/
 hooks/
 scripts/
@@ -28,12 +29,6 @@ clean_files.txt
 install.sh
 lint_clean_files.sh
 
-# aliases
-#
-aliases/available/dnf.aliases.bash
-aliases/available/git.aliases.bash
-aliases/available/vim.aliases.bash
-
 # completions
 #
 completion/available/apm.completion.bash