From a568965d149aae8eea7a8dc07e5a5b19d6701760 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Sun, 9 Jun 2019 14:22:17 -0400 Subject: [PATCH] fix: run shfmt --- docker/etc/my_init.d/10_dokku_init | 2 +- docker/etc/runit/runsvdir/default/dokku-restore/finish | 2 +- docker/etc/runit/runsvdir/default/dokku-restore/run | 2 +- docker/etc/runit/runsvdir/default/nginx/run | 2 +- docker/etc/runit/runsvdir/default/rsyslog/run | 2 +- docker/usr/local/bin/docker | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/etc/my_init.d/10_dokku_init b/docker/etc/my_init.d/10_dokku_init index 050d075a9..a8313c13a 100755 --- a/docker/etc/my_init.d/10_dokku_init +++ b/docker/etc/my_init.d/10_dokku_init @@ -18,7 +18,7 @@ main() { mkdir -p /mount fi - directories=("/etc/ssh" "/home/dokku" "/var/lib/dokku/config" "/var/lib/dokku/data") + directories=("/etc/ssh" "/home/dokku" "/var/lib/dokku/config" "/var/lib/dokku/data") for dir in "${directories[@]}"; do if [[ ! -e "$dir" ]]; then log-info "Copying ${dir} skel into place" diff --git a/docker/etc/runit/runsvdir/default/dokku-restore/finish b/docker/etc/runit/runsvdir/default/dokku-restore/finish index 92f49a93d..ea80c20c0 100755 --- a/docker/etc/runit/runsvdir/default/dokku-restore/finish +++ b/docker/etc/runit/runsvdir/default/dokku-restore/finish @@ -1,6 +1,6 @@ #!/bin/bash -exec >> /var/log/services/dokku-restore +exec >>/var/log/services/dokku-restore exec 2>&1 if [[ "$1" -ne 0 ]]; then diff --git a/docker/etc/runit/runsvdir/default/dokku-restore/run b/docker/etc/runit/runsvdir/default/dokku-restore/run index 58b368a31..4287517ac 100755 --- a/docker/etc/runit/runsvdir/default/dokku-restore/run +++ b/docker/etc/runit/runsvdir/default/dokku-restore/run @@ -1,6 +1,6 @@ #!/bin/bash -exec >> /var/log/services/dokku-restore +exec >>/var/log/services/dokku-restore exec 2>&1 echo "Running dokku-restore" diff --git a/docker/etc/runit/runsvdir/default/nginx/run b/docker/etc/runit/runsvdir/default/nginx/run index 192a059b4..3328faaaf 100755 --- a/docker/etc/runit/runsvdir/default/nginx/run +++ b/docker/etc/runit/runsvdir/default/nginx/run @@ -1,6 +1,6 @@ #!/bin/bash -exec >> /var/log/services/nginx +exec >>/var/log/services/nginx exec 2>&1 echo "Running nginx" diff --git a/docker/etc/runit/runsvdir/default/rsyslog/run b/docker/etc/runit/runsvdir/default/rsyslog/run index 942694f45..9a84a59ed 100755 --- a/docker/etc/runit/runsvdir/default/rsyslog/run +++ b/docker/etc/runit/runsvdir/default/rsyslog/run @@ -1,6 +1,6 @@ #!/bin/bash -exec >> /var/log/services/rsyslog +exec >>/var/log/services/rsyslog exec 2>&1 echo "Running rsyslog" diff --git a/docker/usr/local/bin/docker b/docker/usr/local/bin/docker index 3efb68413..dcebde400 100755 --- a/docker/usr/local/bin/docker +++ b/docker/usr/local/bin/docker @@ -1,5 +1,6 @@ #!/usr/bin/env bash -set -eo pipefail; [[ $TRACE ]] && set -x +set -eo pipefail +[[ $TRACE ]] && set -x main() { declare desc="re-runs docker commands as sudo"