Reformat zshrc.

home/dotfiles/zshrc

@@ -69,8 +69,13 @@ log() {
 section "compat: bash completion"
 if [ $ZSH_COMPAT_BASH_COMPLETION -gt 0 ] || [ $ZSH_PIPX -gt 0 ]; then
 	log "Enabling compatibility for bash completion scripts..."
-	autoload -U bashcompinit
+	autoload -Uz bashcompinit compinit
+
 	bashcompinit
+
+	compinit
+	zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
+	fpath=(/usr/local/share/zsh-completions $fpath)
 fi
 section_end
 
@@ -164,8 +169,7 @@ section_end
 # symfony cli
 section "symfony cli"
 if [ $ZSH_SYMFONY_CLI -gt 0 ]; then
-	if [ -n "$(command -v symfony)" ]
+	if [ -n "$(command -v symfony)" ]; then
-	then
 		complete -C "$(command -v symfony) self:autocomplete" symfony
 	fi
 fi
@@ -177,7 +181,6 @@ if [ $ZSH_THEFUCK -gt 0 ]; then
 fi
 section_end
 
-
 # Default terminal
 section "term"
 if [ $ZSH_DEFAULT_TERM -gt 0 ] && [ -z "$TERM" ]; then
@@ -224,13 +227,11 @@ ssh_docker() {
 	base_path=/var/tmp/ssh-docker/$(sha1sum - <<<"$1" | awk '{print $1}')
 	control_path="${base_path}.control"
 	sock_path="${base_path}.sock"
-	if [ -f "${sock_path}" ]
+	if [ -f "${sock_path}" ]; then
-	then
 		echo "Socket path ${sock_path} already exists." >&2
 		return 1
 	fi
-	if [ -f "${control_path}" ]
+	if [ -f "${control_path}" ]; then
-	then
 		echo "Control path ${control_path} already exists." >&2
 		return 1
 	fi
@@ -244,8 +245,7 @@ ssh_docker() {
 }
 ssh_docker_exit() {
 	args=("$@")
-	if [ "${#args}" -gt 0 ]
+	if [ "${#args}" -gt 0 ]; then
-	then
 		base_path=/var/tmp/ssh-docker/$(sha1sum - <<<"${args[-1]}" | awk '{print $1}')
 		control_path="${base_path}.control"
 		sock_path="${base_path}.sock"
@@ -253,8 +253,7 @@ ssh_docker_exit() {
 		control_path="${DOCKER_SSH_CONTROL_PATH}"
 		sock_path="${DOCKER_SSH_SOCKET_PATH}"
 	fi
-	if [ -z "${control_path}" ]
+	if [ -z "${control_path}" ]; then
-	then
 		echo "No active Docker SSH forwarding found in environment." >&2
 		return 1
 	fi
@@ -262,10 +261,8 @@ ssh_docker_exit() {
 	rm -f "${sock_path}" "${control_path}"
 }
 ssh_docker_cleanup() {
-	for socket in /var/tmp/ssh-docker/*.sock
+	for socket in /var/tmp/ssh-docker/*.sock; do
-	do
+		if [ ! -e "$socket" ]; then
-		if [ ! -e "$socket" ]
-		then
 			continue
 		fi
 		control="$(basename "$socket" .control).sock"
@@ -308,4 +305,3 @@ section_end
 section "Environment variables"
 log "$(export)"
 section_end
-