Throw shfmt against bash scripts

Signed-off-by: Knut Ahlers <knut@ahlers.me>

bin/avhcd2x264

@@ -16,8 +16,7 @@ PASSES="2"
 ###
 ###
 
-if ! [ -f "$1" ]
+if ! [ -f "$1" ]; then
-then
   echo ""$!" is not a file. Nothing to convert."
   exit
 fi
@@ -31,7 +30,7 @@ cleanup() {
 # get creation date
 TIMESTAMP=$(stat -l -t "%Y-%m-%d %H:%M:%S" "$1" | awk '{ print $6" "$7 }')
 # get betrate
-BITRATE=$(ffmpeg -i "$1" 2>&1 |grep bitrate | awk '{print $6}')
+BITRATE=$(ffmpeg -i "$1" 2>&1 | grep bitrate | awk '{print $6}')
 
 # set task priority to low
 NICE="nice -n 19"
@@ -45,8 +44,7 @@ TEMPFILE="$DIRECTORY/.${FILENAME%.*}_${NOW}_ffmpeg.${EXT}"
 
 #METADATA="-metadata creation_time=\"$TIMESTAMP\""
 
-if [ "$PASSES" == "1" ]
+if [ "$PASSES" == "1" ]; then
-then
   # 1 pass encoding
   $NICE ffmpeg -i "$1" -threads auto -loglevel "$LOGLEVEL" -vcodec libx264 -b:v "${BITRATE}k" -vf yadif=1 -acodec libfaac -ab 192k -ar 48000 -sn -metadata creation_time="$TIMESTAMP" -f mp4 -y "${TEMPFILE}"
 else
@@ -60,8 +58,7 @@ fi
 
 touch -r "$1" "${TEMPFILE}"
 
-if [ -f "${1%.*}.${EXT}" ]
+if [ -f "${1%.*}.${EXT}" ]; then
-then
   mv -f "${TEMPFILE}" "${1%.*}_${NOW}.${EXT}"
   echo
   echo "File "${1%.*}.${EXT}" already exist, moved to: "${1%.*}_${NOW}.${EXT}""

bin/backup_gpg

@@ -2,24 +2,24 @@
 
 case $1 in
 
-backup)
+  backup)
     # Backup the trustdb
-  gpg2 --export-ownertrust > .gnupg/trustdb.txt
+    gpg2 --export-ownertrust >.gnupg/trustdb.txt
 
     # Compile the archive
     tar -cvjf - .gnupg/private-keys-v1.d .gnupg/pubring.gpg .gnupg/trustdb.gpg .gnupg/trustdb.txt | gpg2 --output ${HOME}/gnupg_backup.asc --symmetric --armor
     ;;
 
-restore)
+  restore)
 
     # Restore the archive
     gpg2 --decrypt ${HOME}/gnupg_backup.asc | tar -xvj
 
     # Restore the owner-trust
-  gpg2 --import-ownertrust < .gnupg/trustdb.txt
+    gpg2 --import-ownertrust <.gnupg/trustdb.txt
     ;;
 
-*)
+  *)
     echo "Call me like this: $0 <backup | restore>"
     exit 1
     ;;

bin/check_config

@@ -3,46 +3,55 @@ set -euo pipefail
 
 DEBUG=${DEBUG:-false}
 FETCH_INTERVAL=${FETCH_INTERVAL:-3600}
-REPOS=( public secret )
+REPOS=(public secret)
 SSH_KEY=${SSH_KEY:-fafnir}
 
 # Print debug messages if enabled by ${DEBUG}
-function debug {
+function debug() {
-  [[ "${DEBUG}" = "false" ]] && return
+  [[ ${DEBUG} == "false" ]] && return
   echo "$@" >&2
 }
 
-function join_by { local d=$1; shift; echo -n "$1"; shift; printf "%s" "${@/#/$d}"; }
+function join_by() {
+  local d=$1
+  shift
+  echo -n "$1"
+  shift
+  printf "%s" "${@/#/$d}"
+}
 
 # Wrap git to work with git-dir and work-tree being in other locations
-function gwrap {
+function gwrap() {
   hub --git-dir=${HOME}/.cfg/${REPO} --work-tree=${HOME} $@
 }
 
 # Ensure we're connected to network before acting
-if ! ( ping -q -c 1 8.8.8.8 >/dev/null ); then
+if ! (ping -q -c 1 8.8.8.8 >/dev/null); then
   debug "No network connection, not checking"
   exit 0
 fi
 
 STAT_PARM="-c %Y"
-[[ "$(uname -s)" = "Darwin" ]] && STAT_PARM="-f %m"
+[[ "$(uname -s)" == "Darwin" ]] && STAT_PARM="-f %m"
 
 NEED_UPDATE=()
 # Check repos for updates
 for REPO in ${REPOS[@]}; do
   LAST_FETCH=0
   [ -f ~/.cfg/${REPO}/FETCH_HEAD ] && LAST_FETCH=$(stat ${STAT_PARM} ~/.cfg/${REPO}/FETCH_HEAD)
-  if [ $(( $(date +%s) - ${LAST_FETCH} )) -gt ${FETCH_INTERVAL} ] || \
+  if [ $(($(date +%s) - LAST_FETCH)) -gt ${FETCH_INTERVAL} ] ||
     [ $(wc -c ~/.cfg/${REPO}/FETCH_HEAD | cut -d' ' -f1) -eq 0 ]; then
-    vault-sshadd ${SSH_KEY} 2>&1 >/dev/null || { echo "Unable to load key ${SSH_KEY}"; exit 1; }
+    vault-sshadd ${SSH_KEY} 2>&1 >/dev/null || {
+      echo "Unable to load key ${SSH_KEY}"
+      exit 1
+    }
     gwrap fetch -q origin master
   fi
 
   LOCAL=$(gwrap rev-parse HEAD)
   REMOTE=$(gwrap rev-parse FETCH_HEAD)
 
-  if ! [[ "${LOCAL}" = "${REMOTE}" ]]; then
+  if ! [[ ${LOCAL} == "${REMOTE}" ]]; then
     NEED_UPDATE+=("'${REPO}'")
   fi
 done

bin/clean-keys

@@ -29,7 +29,7 @@ keepers_egrep=$(echo $keepers | sed 's/^/^(/; s/$/)/; s/ /|/g;')
 echo '# Keepers: ' $keepers
 
 # everyone who isn't on the keepers list is deleted
-deleters=$(gpg --list-keys | grep '^pub'|  cut -c 13-20 | egrep -v ${keepers_egrep})
+deleters=$(gpg --list-keys | grep '^pub' | cut -c 13-20 | egrep -v ${keepers_egrep})
 
 # echo the command if there are any to delete
 # command is interactive

bin/docker-clean

@@ -4,7 +4,7 @@ set -euo pipefail
 if [ -e "${HOME}/bin/script_framework.sh" ]; then
   source "${HOME}/bin/script_framework.sh"
 else
-  function step { echo $@; }
+  function step() { echo $@; }
 fi
 
 step "Removing containers created / exited >= ~1h ago..."
@@ -14,7 +14,7 @@ CONTAINERS=$(docker ps -a | awk '/(hours?|days?|weeks?|months?) ago\s+(Created|E
 step "Untagging all images not used by containers..."
 PS_OUTPUT=$(docker ps -a)
 for img in $(docker images | awk '/^[a-z].*(hours?|days?|weeks?|months?) ago/{ print $1":"$2 }' | grep -v '<none>' | sort | uniq); do
-  if ! ( echo "${PS_OUTPUT}" | grep -q "\s${img}\s" ) && ! ( echo "${PS_OUTPUT}" | grep -q "\s${img%:latest}\s" ); then
+  if ! (echo "${PS_OUTPUT}" | grep -q "\s${img}\s") && ! (echo "${PS_OUTPUT}" | grep -q "\s${img%:latest}\s"); then
     docker rmi --no-prune "${img}"
   fi
 done

bin/ensure-config.sh

@@ -26,7 +26,7 @@ while getopts "f" opt; do
   esac
 done
 
-shift $((OPTIND-1))
+shift $((OPTIND - 1))
 [ "${1:-}" = "--" ] && shift
 
 # --- OPT parsing ---
@@ -34,11 +34,14 @@ shift $((OPTIND-1))
 if [ -e ${HOME}/bin/script_framework.sh ]; then
   source ${HOME}/bin/script_framework.sh
 else
-  function step { echo "$@"; }
+  function step() { echo "$@"; }
-  function fatal { echo "$@"; exit 1; }
+  function fatal() {
+    echo "$@"
+    exit 1
+  }
 fi
 
-function config {
+function config() {
   git --git-dir="${HOME}/.cfg/${repo_name}" --work-tree="${HOME}" $@
 }
 
@@ -57,7 +60,7 @@ for repo_name in "${!REPOS[@]}"; do
   config config status.showUntrackedFiles no
 
   # Do not overwrite local changes
-  if ( ! config diff --exit-code 2>&1 >/dev/null ) && [ ${FORCE} -eq 0 ]; then
+  if (! config diff --exit-code 2>&1 >/dev/null) && [ ${FORCE} -eq 0 ]; then
     fatal "Repo '${REPO}' has unsaved changes and force-flag is not set"
   fi
 

bin/fix-ssh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 for host in $@; do
-  grep -v ${host} ~/.ssh/known_hosts > ~/.ssh/known_hosts.tmp && mv ~/.ssh/known_hosts.tmp ~/.ssh/known_hosts
+  grep -v ${host} ~/.ssh/known_hosts >~/.ssh/known_hosts.tmp && mv ~/.ssh/known_hosts.tmp ~/.ssh/known_hosts
 done

bin/gen-dockerfile-1.6

@@ -65,7 +65,7 @@ RUN set -ex \\
 EOF
 
 # Allow exposing ports using `-e 3000`
-( test "EXPOSE" != "${EXPOSE}" ) && echo -e "${EXPOSE}\n"
+(test "EXPOSE" != "${EXPOSE}") && echo -e "${EXPOSE}\n"
 
 # Allow
 [ -z "${VOLUME}" ] || echo -e "VOLUME [${VOLUME/, /}]\n"

bin/git-autohook

@@ -6,10 +6,10 @@ if ! [ -e Makefile ]; then
   exit 0
 fi
 
-TARGETS=$(make -pRrq : 2>/dev/null | \
+TARGETS=$(make -pRrq : 2>/dev/null |
-    awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | \
+  awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' |
   sort | egrep -v -e '^[^[:alnum:]]' | sed 's/:$//' | xargs)
 
-if ( echo $TARGETS | grep -q "auto-hook-${HOOKTYPE}" ); then
+if (echo $TARGETS | grep -q "auto-hook-${HOOKTYPE}"); then
   exec make "auto-hook-${HOOKTYPE}"
 fi

bin/git-ps

@@ -20,12 +20,12 @@ git pull --rebase && git submodule update --init --recursive
 step "Cleaning local branches..."
 for branch in $(git branch --merged | grep -v '^*'); do
   # Do not delete master as the main branch
-  if ( test "${branch}" != "master" ); then
+  if (test "${branch}" != "master"); then
     git branch -d ${branch}
   fi
 done
 
 step "Removing local branches where remote branch is gone..."
-if ( git branch -vv | grep -q ': gone]' ); then
+if (git branch -vv | grep -q ': gone]'); then
   git branch -vv | awk '/: gone]/{print $1}' | xargs git branch -D
 fi

bin/git_status_recursive

@@ -4,11 +4,11 @@
 
 startpath=$(pwd)
 
-for repo in $(find . -name ".git")
+for repo in $(find . -name ".git"); do
-do
   repodir=$(dirname $repo)
   reponame=$(basename $repodir)
-    cd $repodir; LANG=C git status | grep -q "nothing to commit"
+  cd $repodir
+  LANG=C git status | grep -q "nothing to commit"
   state=$?
   cd $startpath
   echo -n "$reponame: "

bin/gitignore

@@ -1,5 +1,5 @@
 #!/bin/bash
 
 for i in "$@"; do
-  echo "$i" >> .gitignore
+  echo "$i" >>.gitignore
 done

bin/local-vault-auth

@@ -1,10 +1,13 @@
 #!/bin/bash
 set -euo pipefail
 
-function require_gotool {
+function require_gotool() {
   toolname=$(basename $1)
-  if ! ( which ${toolname} >/dev/null 2>&1 ); then
+  if ! (which ${toolname} >/dev/null 2>&1); then
-    go version || { echo "${basename} not found and no usable go environment"; exit 1; }
+    go version || {
+      echo "${basename} not found and no usable go environment"
+      exit 1
+    }
     go get -u $1
   fi
 }
@@ -15,7 +18,7 @@ source "${HOME}/.config/vault-user-token"
 source "${HOME}/bin/script_framework.sh"
 
 # Check whether a valid token is available
-( vault token-lookup >/dev/null 2>&1 ) && exit 0
+(vault token-lookup >/dev/null 2>&1) && exit 0
 
 step "Vault is not authenticated, trying to authenticate... "
 
@@ -23,7 +26,10 @@ step "Vault is not authenticated, trying to authenticate... "
 rm -f "${HOME}/.vault-token"
 
 VUT=$(pgrep -f vault-user-token || echo "" | xargs)
-[ -n "$VUT" ] && { step "Killing old vault-user-token processes..."; kill ${VUT}; }
+[ -n "$VUT" ] && {
+  step "Killing old vault-user-token processes..."
+  kill ${VUT}
+}
 
 # Start new vault-user-token daemon
 vault-user-token --full-hostname=false >/dev/null 2>&1 &
@@ -34,11 +40,11 @@ while ! [ -f "${HOME}/.vault-token" ]; do
   # Give the program a moment to get a token
   sleep 0.5
 
-  if ! ( kill -0 $VUT ); then
+  if ! (kill -0 $VUT); then
     fail "vault-user-token exitted, giving up."
   fi
 done
 
-( vault token-lookup >/dev/null 2>&1 ) || fail "Vault authentication failed finally"
+(vault token-lookup >/dev/null 2>&1) || fail "Vault authentication failed finally"
 
 success "Vault token became available and is valid"

bin/pwdpwn

@@ -8,7 +8,7 @@ source ${HOME}/bin/script_framework.sh
 [ $# -lt 1 ] && fail "You need to supply at least password as argument"
 
 # Check against online API using range request not to disclose the password hash
-function check_password {
+function check_password() {
   checksum=$(echo -n "${1}" | sha1sum | tr 'a-z' 'A-Z')
   curl -s https://api.pwnedpasswords.com/range/${checksum:0:5} |
     awk -F: "/${checksum:5:35}/{ print \$2 }" | tr -d '\n\r'

bin/resume

@@ -3,11 +3,11 @@
 source "${HOME}/bin/script_framework.sh"
 
 [ -n "${TMUX}" ] && fail "You are already in tmux!"
-( which tmux 2>/dev/null ) || fail "No tmux found, can't continue"
+(which tmux 2>/dev/null) || fail "No tmux found, can't continue"
 
 tmux-agent
 
-if ! ( tmux list-sessions ); then
+if ! (tmux list-sessions); then
   tmux new-session -d
   tmux split-window -h
 fi

bin/script_framework.sh

@@ -4,27 +4,27 @@ COLOR_CYAN="\033[0;36m"
 COLOR_YELLOW="\033[0;33m"
 COLOR_PLAIN="\033[0m"
 
-function error {
+function error() {
   echo -e "${COLOR_RED}$@${COLOR_PLAIN}"
 }
 
-function fail {
+function fail() {
   error "$@"
   exit 1
 }
 
-function info {
+function info() {
   echo -e "${COLOR_CYAN}$@${COLOR_PLAIN}"
 }
 
-function step {
+function step() {
   info "[$(date +%H:%M:%S)] $@"
 }
 
-function success {
+function success() {
   echo -e "${COLOR_GREEN}$@${COLOR_PLAIN}"
 }
 
-function warn {
+function warn() {
   echo -e "${COLOR_YELLOW}$@${COLOR_PLAIN}"
 }

bin/sslcert

@@ -10,7 +10,7 @@ while getopts s opt; do
   esac
 done
 
-shift $(( OPTIND - 1 ))
+shift $((OPTIND - 1))
 
 domain=$1
 

bin/system-audit

@@ -6,16 +6,17 @@ set -e
 BASE_PATH=/tmp/system-audit
 GIT_DIR=/var/local/system-audit
 
-function collect_hashes {
+function collect_hashes() {
-  target=$1; shift
+  target=$1
+  shift
   for dir in $@; do
     if ! [ -e "${dir}" ]; then
-      echo "${dir}" >> ${BASE_PATH}/missing
+      echo "${dir}" >>${BASE_PATH}/missing
       wrap_git add --intent-to-add ${BASE_PATH}/missing
       continue
     fi
 
-    find ${dir} -mindepth 1 \( -type f -or -type l \) -print0 | xargs -0 shasum -a 512 >> ${target}
+    find ${dir} -mindepth 1 \( -type f -or -type l \) -print0 | xargs -0 shasum -a 512 >>${target}
   done
 
   if [ -e ${target} ]; then
@@ -23,7 +24,7 @@ function collect_hashes {
   fi
 }
 
-function wrap_git {
+function wrap_git() {
   git --work-tree=${BASE_PATH} --git-dir=${GIT_DIR} "$@"
   return $?
 }
@@ -44,7 +45,7 @@ fi
 
 case "$1" in
 
-"collect")
+  "collect")
     # Remove old hash-files
     rm -rf ${BASE_PATH}/*
 
@@ -67,17 +68,17 @@ case "$1" in
     collect_hashes ${BASE_PATH}/bin /usr/bin /usr/local/bin ~/bin
     ;;
 
-"freeze")
+  "freeze")
     wrap_git commit -S -a -m "Status freeze as of $(date)"
     ;;
 
-"check")
+  "check")
     $0 collect
     $0 diff --exit-code
     echo "Everything is still in recorded state"
     ;;
 
-"init")
+  "init")
     if [ $($0 log --pretty=format:'%h [%G?]%d %s (%cr) <%an>' --abbrev-commit | wc -l) -gt 0 ]; then
       echo "The status was already initialized. Use 'collect' and 'diff' to review the state and 'freeze' to save it"
       exit 1
@@ -87,7 +88,7 @@ case "$1" in
     $0 freeze
     ;;
 
-*)
+  *)
     wrap_git "$@"
     ;;
 

bin/tmphttp

@@ -3,7 +3,7 @@
 set -e
 set -o pipefail
 
-function unexpose {
+function unexpose() {
   expose -d 8888
 }
 trap unexpose EXIT

bin/vault-awsenv

@@ -1,13 +1,12 @@
 #!/bin/bash
 
-if ! ( which vault > /dev/null ); then
+if ! (which vault >/dev/null); then
   error "vault is required."
   exit 2
 fi
 
-
 # If we can list the environments there is no need to unlock the database
-if ( awsenv list > /dev/null 2>&1 ); then
+if (awsenv list >/dev/null 2>&1); then
   echo "Database already unlocked."
   exit 0
 fi
@@ -31,11 +30,10 @@ expect eof
 EOF
 
 # Check whether awsenv was unlocked
-if ( awsenv list > /dev/null 2>&1 ); then
+if (awsenv list >/dev/null 2>&1); then
   echo "Database unlocked successfully"
   exit 0
 else
   echo "Found passphrase but could not unlock database."
   exit 1
 fi
-

bin/vault-gpg

@@ -21,7 +21,7 @@ HEXPWD=$(echo -n "${PWD}" | str2hex)
 for KEYGRIP in $(gpg2 --with-keygrip -k ${KEY} | grep Keygrip | cut -d '=' -f 2 | xargs); do
 
   # Set password for keygrip
-  if ! ( gpg-connect-agent -q "PRESET_PASSPHRASE ${KEYGRIP} -1 ${HEXPWD}" /bye >/dev/null 2>&1 ); then
+  if ! (gpg-connect-agent -q "PRESET_PASSPHRASE ${KEYGRIP} -1 ${HEXPWD}" /bye >/dev/null 2>&1); then
     echo "An error occurred while caching password in GPG agent"
     exit 1
   fi

bin/vault-sshadd

@@ -5,7 +5,7 @@ set -o pipefail
 
 source "${HOME}/bin/script_framework.sh"
 
-if ! ( which vault > /dev/null ); then
+if ! (which vault >/dev/null); then
   error "vault is required."
   exit 2
 fi
@@ -21,7 +21,7 @@ HELPER=$(mktemp)
 chmod 0700 ${HELPER}
 trap "rm ${HELPER}" EXIT
 
-cat -s <<EOF > ${HELPER}
+cat -s <<EOF >${HELPER}
 #!/bin/bash
 vault read -field=private "/secret/ssh-key/\$1" | exec ssh-add -t 3600 -
 EOF
@@ -30,7 +30,7 @@ for KEY_NAME in $@; do
   fingerprint=$(vault read -field=public "/secret/ssh-key/$1" | ssh-keygen -l -f -)
 
   # If this key is already in the agent we don't need to do anything
-  if ( ssh-add -l | grep -q "${fingerprint}" ); then
+  if (ssh-add -l | grep -q "${fingerprint}"); then
     info "[${KEY_NAME}] Key already present."
     continue
   fi

bin/venv

@@ -7,4 +7,3 @@ set -o pipefail
 source .venv/bin/activate
 
 [ -f requirements.txt ] && pip install -r requirements.txt
-

bin/zsh-refresh-godirs

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-find $HOME -type f -name '.gopath' | sed 's!/.gopath$!!' > /tmp/godirs
+find $HOME -type f -name '.gopath' | sed 's!/.gopath$!!' >/tmp/godirs
 mv /tmp/godirs $HOME/.config/godirs