added shfmt tests and let it rip the code...

Author: Ira Abramov

.pre-commit-config.yaml

@@ -1,7 +1,30 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+---
+# fail_fast: true
+minimum_pre_commit_version: 1.18.1
+exclude: "docs/_build/"
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v2.3.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
+      - id: trailing-whitespace
+        exclude: ".(md|rst)$"
+      - id: end-of-file-fixer
+      - id: check-merge-conflict
+      - id: mixed-line-ending
+      - id: check-added-large-files
+  - repo: https://github.com/jumanjihouse/pre-commit-hooks
+    rev: 2.1.5
+    hooks:
+      - id: git-check  # Configure in .gitattributes
+      - id: shellcheck
+        exclude: ".bats$"
+      - id: shfmt
+        exclude: ".bats$"
+  - repo: https://github.com/Lucas-C/pre-commit-hooks
+    rev: v1.1.7
+    hooks:
+      # - id: forbid-crlf
+      - id: remove-crlf
+        exclude: ".bat$"

bootstrap.sh

@@ -6,19 +6,26 @@ set -e
 sudo -v
 
 # Keep-alive: update existing `sudo` time stamp until this script has finished
-while true; do sudo -n true; sleep 60; kill -0 "$$" || exit; done 2>/dev/null &
+while true; do
+	sudo -n true
+	sleep 60
+	kill -0 "$$" || exit
+done 2>/dev/null &
 
 if [[ "$OSTYPE" == "darwin"* ]]; then
 
-#####################################
-##################### MacOS env setup
-#####################################
+	#####################################
+	##################### MacOS env setup
+	#####################################
 
-	if ! hash brew 2>/dev/null ; then
+	if ! hash brew 2>/dev/null; then
 		echo "Installing Brew"
 		/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 	fi
-	hash brew 2>/dev/null || { echo "install brew first" ; exit 1 ; }
+	hash brew 2>/dev/null || {
+		echo "install brew first"
+		exit 1
+	}
 
 	brew doctor
 	brew tap homebrew/cask-versions
@@ -28,14 +35,14 @@ if [[ "$OSTYPE" == "darwin"* ]]; then
 	brew install screen the_silver_searcher git curl hub fd fzf wget cmake node
 
 	# This little joke kills some of our nicest code.
-	test -r /etc/bashrc_Apple_Terminal && \
+	test -r /etc/bashrc_Apple_Terminal &&
 		sudo mv /etc/bashrc_Apple_Terminal /etc/bashrc_Apple_Terminal.disabled
 
-elif [[ -f /etc/redhat-release ]] ; then
+elif [[ -f /etc/redhat-release ]]; then
 
-#####################################
-##################### RH-ish env setup
-#####################################
+	#####################################
+	##################### RH-ish env setup
+	#####################################
 
 	# Enable Fedora
 	sudo dnf copr enable tkbcopr/fd -y
@@ -46,22 +53,22 @@ elif [[ -f /etc/redhat-release ]] ; then
 		git clone -q --depth 1 https://github.com/junegunn/fzf.git ~/.fzf &&
 		~/.fzf/install --all --no-zsh --no-fish --no-update-rc
 
-elif [[ "$(lsb_release -is)" == "Ubuntu" ]] || [[ "$(lsb_release -is)" == "Debian" ]] ; then
+elif [[ "$(lsb_release -is)" == "Ubuntu" ]] || [[ "$(lsb_release -is)" == "Debian" ]]; then
 
-#####################################
-#################### Ubuntu env setup
-#####################################
+	#####################################
+	#################### Ubuntu env setup
+	#####################################
 
 	echo "installing some essential packages"
 	sudo apt update
 	sudo apt install -y screen silversearcher-ag curl git \
-			software-properties-common python3-pip rubygems tmux build-essential \
-			cmake python3-dev nodejs npm python-dev
+		software-properties-common python3-pip rubygems tmux build-essential \
+		cmake python3-dev nodejs npm python-dev
 
 	# Adding backports, neovim and other useful bits.
 	sudo add-apt-repository -u "deb http://archive.ubuntu.com/ubuntu/ $(lsb_release -cs)-backports main restricted universe multiverse"
 
-	if ! hash nvim 2>/dev/null ; then
+	if ! hash nvim 2>/dev/null; then
 		echo "install neovim, trying from default sources"
 		sudo apt install -y neovim || {
 			sudo add-apt-repository -u ppa:neovim-ppa/stable -y && sudo apt update
@@ -78,11 +85,11 @@ elif [[ "$(lsb_release -is)" == "Ubuntu" ]] || [[ "$(lsb_release -is)" == "Debia
 	fi
 
 	# Download fd
-	if hash fd 2>/dev/null ; then
+	if hash fd 2>/dev/null; then
 		echo "fd exists."
 	else
 		fdversion=7.2.0
-		wget -q https://github.com/sharkdp/fd/releases/download/v${fdversion}/fd_${fdversion}_amd64.deb && \
+		wget -q https://github.com/sharkdp/fd/releases/download/v${fdversion}/fd_${fdversion}_amd64.deb &&
 			sudo dpkg -i fd_${fdversion}_amd64.deb
 
 		rm -Rf fd_${fdversion}_amd64.deb
@@ -99,23 +106,24 @@ fi
 
 [[ -d "$HOME/.homesick/repos/homeshick" ]] ||
 	git clone https://github.com/andsens/homeshick.git "$HOME/.homesick/repos/homeshick"
+# shellcheck disable=SC1091
 source "$HOME/.homesick/repos/homeshick/homeshick.sh"
 
 # Have ensured that homesick is available
 hash homeshick 2>/dev/null || (echo "homeshick install failed" && exit 1)
 
 pip3 install --upgrade powerline-status --user
 
-if [[ -d "$HOME/.homesick/repos/dotfiles" ]] ; then
+if [[ -d "$HOME/.homesick/repos/dotfiles" ]]; then
 	echo "Oh good, the homeshick is already checked out..."
 else
 	## Clone dotfiles
 	echo "Cloning the dotfiles"
 	homeshick clone seefood/dotfiles
 
-	while read -r dir ; do
+	while read -r dir; do
 		mkdir -p ~/"${dir}"
-	done < ~/.homesick/repos/dotfiles/.homesick_subdir
+	done <~/.homesick/repos/dotfiles/.homesick_subdir
 fi
 
 homeshick symlink dotfiles
@@ -128,16 +136,16 @@ echo "Make sure you have your correct settings in ~/.gitconfig.local"
 echo ''
 echo "Now installing vundle..."
 echo ''
-[[ -d ~/.vim/bundle/Vundle.vim ]] || \
+[[ -d ~/.vim/bundle/Vundle.vim ]] ||
 	git clone -q https://github.com/VundleVim/Vundle.vim.git ~/.vim/bundle/Vundle.vim
 
 # Install pathogen for vim/neovim
 mkdir -p ~/.vim/autoload ~/.vim/bundle
-[[ -r ~/.vim/autoload/pathogen.vim ]] || \
+[[ -r ~/.vim/autoload/pathogen.vim ]] ||
 	curl -LSso ~/.vim/autoload/pathogen.vim https://tpo.pe/pathogen.vim
 
 # Vim color scheme install
-if ! [[ -d ~/.vim/colors/wombat/ ]] ; then
+if ! [[ -d ~/.vim/colors/wombat/ ]]; then
 	echo ''
 	echo "Now installing vim wombat color scheme..."
 	echo ''
@@ -149,7 +157,7 @@ echo 'fire up vundle installation'
 vim +PluginInstall +qall && echo 'vim plugins installed!'
 
 # Bash color scheme
-if ! [[ -r ~/.dircolors ]] ; then
+if ! [[ -r ~/.dircolors ]]; then
 	echo ''
 	echo "Now installing solarized dark WSL color scheme..."
 	echo ''

home/.bash.aliases.d/dev.general.sh

@@ -4,29 +4,28 @@ alias json='python -mjson.tool'
 export GOPATH=~/go
 
 function ps() {
-  if [ $# -eq 0 ]; then
-    command ps aux --sort rss
-  elif [ $# -eq 2 ] && [ "$1" == '-p' ]; then
-    local p=$2
+	if [ $# -eq 0 ]; then
+		command ps aux --sort rss
+	elif [ $# -eq 2 ] && [ "$1" == '-p' ]; then
+		local p=$2
 
-    mapfile -t plist < <(command ps -aef | awk -v x="${p}" ' $8 ~ x { print $2 } ')
-    size=${#plist}
+		mapfile -t plist < <(command ps -aef | awk -v x="${p}" ' $8 ~ x { print $2 } ')
+		size=${#plist}
 
-    if [ "$size" -ne 0 ]; then
-      command ps -u -p "${plist[@]}"
-      command ps -u -p "${plist[@]}" | grep -v PID | awk '{ sum+=$3} END {print "CPU %:", sum}'
-      command ps -u -p "${plist[@]}" | grep -v PID | awk '{ sum+=$4} END {print "MEM %:", sum}'
-    else
-      echo "[$p] process not found"
-    fi
-  else
-    command ps "$@"
-  fi
-  lscpu | grep "CPU MHz"
+		if [ "$size" -ne 0 ]; then
+			command ps -u -p "${plist[@]}"
+			command ps -u -p "${plist[@]}" | grep -v PID | awk '{ sum+=$3} END {print "CPU %:", sum}'
+			command ps -u -p "${plist[@]}" | grep -v PID | awk '{ sum+=$4} END {print "MEM %:", sum}'
+		else
+			echo "[$p] process not found"
+		fi
+	else
+		command ps "$@"
+	fi
+	lscpu | grep "CPU MHz"
 }
 
-function yaml2json()
-{
-  ruby -ryaml -rjson -e \
-    'puts JSON.pretty_generate(YAML.load(ARGF))' "$@"
+function yaml2json() {
+	ruby -ryaml -rjson -e \
+		'puts JSON.pretty_generate(YAML.load(ARGF))' "$@"
 }

home/.bash.aliases.d/dev.git.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 function parse_git_branch {
-  git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1):/'
+	git branch --no-color 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1):/'
 }
 
 # Set vcprompt executable path for scm advance info in prompt (demula theme)

home/.bash.aliases.d/ira.private.sh

@@ -1,39 +1,39 @@
 #!/bin/bash
-if [[ $USER =~ ^ira ]] ; then
-
-  # alias android-connect="mtpfs -o allow_other /media/GalaxyS2"
-  # alias android-disconnect="fusermount -u /media/GalaxyS2"
-
-  # alias tat='vi ~/bin/tatsuya && strfile ~/bin/tatsuya'
-
-  alias uma='ssh [email protected]'
-
-  alias socks5="ssh scso.com -qfN -D 9051"
-  alias mgif='v2gif *.webm *.mp4 -d'
-
-  if [[ "$OSTYPE" == "darwin"* ]]; then
-    alias upt='brew upgrade'
-    alias uupt='brew upgrade'
-  else
-    alias upt='sudo apt -u dist-upgrade'
-    alias uupt='sudo apt update && upt'
-    alias uptc='uupt ; sudo apt-get --purge autoremove  `deborphan` `deborphan  --guess-dev` `deborphan --guess-debug`'
-
-    #alias tat='vi ~/bin/tatsuya && strfile ~/bin/tatsuya'
-    alias kgs="busctl --user call org.gnome.Shell /org/gnome/Shell org.gnome.Shell Eval s 'Meta.restart(\"Restarting…\")'"
-
-    function df () {
-      if [[ "$*" ]] ; then
-        /bin/df "$@"
-      else
-        /bin/df -hT -x squashfs -x tmpfs
-      fi
-    }
-  fi
-
-  alias scan='sudo nmap -sS -Pn -R -v -O -f'
-  alias beep="echo -e '\a'; sleep 1; echo -e '\a'; sleep 1; echo -e '\a'"
-  type -P colorls >/dev/null && alias ls='colorls --sort-dirs --gs'
-  export DEBEMAIL="[email protected]"
-  export DEBFULLNAME="Ira Abramov"
+if [[ $USER =~ ^ira ]]; then
+
+	# alias android-connect="mtpfs -o allow_other /media/GalaxyS2"
+	# alias android-disconnect="fusermount -u /media/GalaxyS2"
+
+	# alias tat='vi ~/bin/tatsuya && strfile ~/bin/tatsuya'
+
+	alias uma='ssh [email protected]'
+
+	alias socks5="ssh scso.com -qfN -D 9051"
+	alias mgif='v2gif *.webm *.mp4 -d'
+
+	if [[ "$OSTYPE" == "darwin"* ]]; then
+		alias upt='brew upgrade'
+		alias uupt='brew upgrade'
+	else
+		alias upt='sudo apt -u dist-upgrade'
+		alias uupt='sudo apt update && upt'
+		alias uptc='uupt ; sudo apt-get --purge autoremove  `deborphan` `deborphan  --guess-dev` `deborphan --guess-debug`'
+
+		#alias tat='vi ~/bin/tatsuya && strfile ~/bin/tatsuya'
+		alias kgs="busctl --user call org.gnome.Shell /org/gnome/Shell org.gnome.Shell Eval s 'Meta.restart(\"Restarting…\")'"
+
+		function df() {
+			if [[ "$*" ]]; then
+				/bin/df "$@"
+			else
+				/bin/df -hT -x squashfs -x tmpfs
+			fi
+		}
+	fi
+
+	alias scan='sudo nmap -sS -Pn -R -v -O -f'
+	alias beep="echo -e '\a'; sleep 1; echo -e '\a'; sleep 1; echo -e '\a'"
+	type -P colorls >/dev/null && alias ls='colorls --sort-dirs --gs'
+	export DEBEMAIL="[email protected]"
+	export DEBFULLNAME="Ira Abramov"
 fi

home/.bash.aliases.d/ira.video.sh

@@ -2,21 +2,21 @@
 
 # Get cracking on some demuxing
 
-function demuxaudio () {
-    about 'Demux audio out of a .mov/.avi/.mp4 file.'
-    group 'gif'
-    param '1: MOV/AVI/MP4 file name(s)'
+function demuxaudio() {
+	about 'Demux audio out of a .mov/.avi/.mp4 file.'
+	group 'gif'
+	param '1: MOV/AVI/MP4 file name(s)'
 
-    for file ; do
+	for file; do
 
-        local output_file="${file%.*}"
-        local output_suffix
-        output_suffix="$(mediainfo "$file" | grep "Format  " | \
-            tail -1 | awk '{print $3}' | tr '[:upper:]' '[:lower:]')"
-        # Common names
-        [[ $output_suffix == "opus" ]] && output_suffix="ogg"
+		local output_file="${file%.*}"
+		local output_suffix
+		output_suffix="$(mediainfo "$file" | grep "Format  " |
+			tail -1 | awk '{print $3}' | tr '[:upper:]' '[:lower:]')"
+		# Common names
+		[[ $output_suffix == "opus" ]] && output_suffix="ogg"
 
-        ffmpeg -loglevel panic -i "${file}" -c:a copy -vn -sn "${output_file}.${output_suffix}"
+		ffmpeg -loglevel panic -i "${file}" -c:a copy -vn -sn "${output_file}.${output_suffix}"
 
-    done
+	done
 }

home/.bash.aliases.d/user.defaultprompt.sh

@@ -1,12 +1,12 @@
 #!/bin/bash
 function parse_git_branch {
-  git branch 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
+	git branch 2>/dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/(\1)/'
 }
 
 export PS1="\[\033[36m\]\u\[\033[m\]@\[\033[32m\]\h:\[\033[33;1m\]\w \[\033[01;31m\]\$(parse_git_branch)\[\033[00m\]\$ "
 export CLICOLOR=1
 export LSCOLORS=ExFxBxDxCxegedabagacad
 
 function iterm2_print_user_vars() {
-  iterm2_set_user_var gitBranch "$( (git branch 2> /dev/null) | grep '\*' | cut -c3-)"
+	iterm2_set_user_var gitBranch "$( (git branch 2>/dev/null) | grep '\*' | cut -c3-)"
 }