home/dotfiles/zshrc

@@ -41,21 +41,21 @@ section() {
 	if [ $ZSH_DEBUG -gt 0 ]; then
 		echo "${ZSH_DEBUG_SECTION_START_PREFIX}$(tput smso)$*$(tput rmso)"
 	fi
-	((DEBUG_INDENT++))
+	(( DEBUG_INDENT++ ))
 }
 
 section_end() {
 	if [ $ZSH_DEBUG -gt 0 ]; then
 		echo "$ZSH_DEBUG_SECTION_END_TEXT"
 	fi
-	((DEBUG_INDENT--))
+	(( DEBUG_INDENT-- ))
 }
 
 log() {
 	if [ $ZSH_DEBUG -gt 0 ]; then
 		indent=""
 		if [ $DEBUG_INDENT -gt 0 ]; then
-			for i in $(seq 0 $((DEBUG_INDENT - 1))); do
+			for i in $(seq 0 $(( DEBUG_INDENT-1 )) ); do
 				indent+="$ZSH_DEBUG_INDENT"
 			done
 		fi
@@ -69,13 +69,8 @@ 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 -Uz bashcompinit compinit
+	autoload -U bashcompinit
-
 	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
 
@@ -169,7 +164,8 @@ section_end
 # symfony cli
 section "symfony cli"
 if [ $ZSH_SYMFONY_CLI -gt 0 ]; then
-	if [ -n "$(command -v symfony)" ]; then
+	if [ -n "$(command -v symfony)" ]
+	then
 		complete -C "$(command -v symfony) self:autocomplete" symfony
 	fi
 fi
@@ -181,6 +177,7 @@ if [ $ZSH_THEFUCK -gt 0 ]; then
 fi
 section_end
 
+
 # Default terminal
 section "term"
 if [ $ZSH_DEFAULT_TERM -gt 0 ] && [ -z "$TERM" ]; then
@@ -223,15 +220,17 @@ section_end
 section "ssh-based remote docker access"
 ssh_docker() {
 	args=("$@")
-	control_path=$(sha1sum - <<<"${args[-1]}" | awk '{print $1}')
+	control_path=$(sha1sum - <<< "${args[-1]}" | awk '{print $1}')
-	base_path=/var/tmp/ssh-docker/$(sha1sum - <<<"$1" | awk '{print $1}')
+	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}" ]; then
+	if [ -f "${sock_path}" ]
+	then
 		echo "Socket path ${sock_path} already exists." >&2
 		return 1
 	fi
-	if [ -f "${control_path}" ]; then
+	if [ -f "${control_path}" ]
+	then
 		echo "Control path ${control_path} already exists." >&2
 		return 1
 	fi
@@ -245,15 +244,17 @@ ssh_docker() {
 }
 ssh_docker_exit() {
 	args=("$@")
-	if [ "${#args}" -gt 0 ]; then
+	if [ "${#args}" -gt 0 ]
-		base_path=/var/tmp/ssh-docker/$(sha1sum - <<<"${args[-1]}" | awk '{print $1}')
+	then
+		base_path=/var/tmp/ssh-docker/$(sha1sum - <<< "${args[-1]}" | awk '{print $1}')
 		control_path="${base_path}.control"
 		sock_path="${base_path}.sock"
 	else
 		control_path="${DOCKER_SSH_CONTROL_PATH}"
 		sock_path="${DOCKER_SSH_SOCKET_PATH}"
 	fi
-	if [ -z "${control_path}" ]; then
+	if [ -z "${control_path}" ]
+	then
 		echo "No active Docker SSH forwarding found in environment." >&2
 		return 1
 	fi
@@ -261,14 +262,16 @@ ssh_docker_exit() {
 	rm -f "${sock_path}" "${control_path}"
 }
 ssh_docker_cleanup() {
-	for socket in /var/tmp/ssh-docker/*.sock; do
+	for socket in /var/tmp/ssh-docker/*.sock
-		if [ ! -e "$socket" ]; then
+	do
+		if [ ! -e "$socket" ]
+		then
 			continue
 		fi
 		control="$(basename "$socket" .control).sock"
 		DOCKER_SSH_CONTROL_PATH="$control" \
-			DOCKER_SSH_SOCKET_PATH="$socket" \
+		DOCKER_SSH_SOCKET_PATH="$socket" \
-			ssh_docker_exit
+		ssh_docker_exit
 	done
 }
 export ssh_docker
@@ -305,3 +308,4 @@ section_end
 section "Environment variables"
 log "$(export)"
 section_end
+