Reformat zshrc.
parent
616bad2615
commit
528c88a5a5
|
@ -41,21 +41,21 @@ section() {
|
||||||
if [ $ZSH_DEBUG -gt 0 ]; then
|
if [ $ZSH_DEBUG -gt 0 ]; then
|
||||||
echo "${ZSH_DEBUG_SECTION_START_PREFIX}$(tput smso)$*$(tput rmso)"
|
echo "${ZSH_DEBUG_SECTION_START_PREFIX}$(tput smso)$*$(tput rmso)"
|
||||||
fi
|
fi
|
||||||
(( DEBUG_INDENT++ ))
|
((DEBUG_INDENT++))
|
||||||
}
|
}
|
||||||
|
|
||||||
section_end() {
|
section_end() {
|
||||||
if [ $ZSH_DEBUG -gt 0 ]; then
|
if [ $ZSH_DEBUG -gt 0 ]; then
|
||||||
echo "$ZSH_DEBUG_SECTION_END_TEXT"
|
echo "$ZSH_DEBUG_SECTION_END_TEXT"
|
||||||
fi
|
fi
|
||||||
(( DEBUG_INDENT-- ))
|
((DEBUG_INDENT--))
|
||||||
}
|
}
|
||||||
|
|
||||||
log() {
|
log() {
|
||||||
if [ $ZSH_DEBUG -gt 0 ]; then
|
if [ $ZSH_DEBUG -gt 0 ]; then
|
||||||
indent=""
|
indent=""
|
||||||
if [ $DEBUG_INDENT -gt 0 ]; then
|
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"
|
indent+="$ZSH_DEBUG_INDENT"
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
@ -169,8 +169,7 @@ section_end
|
||||||
# symfony cli
|
# symfony cli
|
||||||
section "symfony cli"
|
section "symfony cli"
|
||||||
if [ $ZSH_SYMFONY_CLI -gt 0 ]; then
|
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
|
complete -C "$(command -v symfony) self:autocomplete" symfony
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -182,7 +181,6 @@ if [ $ZSH_THEFUCK -gt 0 ]; then
|
||||||
fi
|
fi
|
||||||
section_end
|
section_end
|
||||||
|
|
||||||
|
|
||||||
# Default terminal
|
# Default terminal
|
||||||
section "term"
|
section "term"
|
||||||
if [ $ZSH_DEFAULT_TERM -gt 0 ] && [ -z "$TERM" ]; then
|
if [ $ZSH_DEFAULT_TERM -gt 0 ] && [ -z "$TERM" ]; then
|
||||||
|
@ -225,17 +223,15 @@ section_end
|
||||||
section "ssh-based remote docker access"
|
section "ssh-based remote docker access"
|
||||||
ssh_docker() {
|
ssh_docker() {
|
||||||
args=("$@")
|
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"
|
control_path="${base_path}.control"
|
||||||
sock_path="${base_path}.sock"
|
sock_path="${base_path}.sock"
|
||||||
if [ -f "${sock_path}" ]
|
if [ -f "${sock_path}" ]; then
|
||||||
then
|
|
||||||
echo "Socket path ${sock_path} already exists." >&2
|
echo "Socket path ${sock_path} already exists." >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [ -f "${control_path}" ]
|
if [ -f "${control_path}" ]; then
|
||||||
then
|
|
||||||
echo "Control path ${control_path} already exists." >&2
|
echo "Control path ${control_path} already exists." >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
@ -249,17 +245,15 @@ ssh_docker() {
|
||||||
}
|
}
|
||||||
ssh_docker_exit() {
|
ssh_docker_exit() {
|
||||||
args=("$@")
|
args=("$@")
|
||||||
if [ "${#args}" -gt 0 ]
|
if [ "${#args}" -gt 0 ]; then
|
||||||
then
|
base_path=/var/tmp/ssh-docker/$(sha1sum - <<<"${args[-1]}" | awk '{print $1}')
|
||||||
base_path=/var/tmp/ssh-docker/$(sha1sum - <<< "${args[-1]}" | awk '{print $1}')
|
|
||||||
control_path="${base_path}.control"
|
control_path="${base_path}.control"
|
||||||
sock_path="${base_path}.sock"
|
sock_path="${base_path}.sock"
|
||||||
else
|
else
|
||||||
control_path="${DOCKER_SSH_CONTROL_PATH}"
|
control_path="${DOCKER_SSH_CONTROL_PATH}"
|
||||||
sock_path="${DOCKER_SSH_SOCKET_PATH}"
|
sock_path="${DOCKER_SSH_SOCKET_PATH}"
|
||||||
fi
|
fi
|
||||||
if [ -z "${control_path}" ]
|
if [ -z "${control_path}" ]; then
|
||||||
then
|
|
||||||
echo "No active Docker SSH forwarding found in environment." >&2
|
echo "No active Docker SSH forwarding found in environment." >&2
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
@ -267,16 +261,14 @@ ssh_docker_exit() {
|
||||||
rm -f "${sock_path}" "${control_path}"
|
rm -f "${sock_path}" "${control_path}"
|
||||||
}
|
}
|
||||||
ssh_docker_cleanup() {
|
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
|
continue
|
||||||
fi
|
fi
|
||||||
control="$(basename "$socket" .control).sock"
|
control="$(basename "$socket" .control).sock"
|
||||||
DOCKER_SSH_CONTROL_PATH="$control" \
|
DOCKER_SSH_CONTROL_PATH="$control" \
|
||||||
DOCKER_SSH_SOCKET_PATH="$socket" \
|
DOCKER_SSH_SOCKET_PATH="$socket" \
|
||||||
ssh_docker_exit
|
ssh_docker_exit
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
export ssh_docker
|
export ssh_docker
|
||||||
|
@ -313,4 +305,3 @@ section_end
|
||||||
section "Environment variables"
|
section "Environment variables"
|
||||||
log "$(export)"
|
log "$(export)"
|
||||||
section_end
|
section_end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue