From 0c8aca40681075310b7ab6118b2077d51a49c173 Mon Sep 17 00:00:00 2001
From: Cyril Tovena <cyril.tovena@gmail.com>
Date: Tue, 6 Jul 2021 13:32:15 +0200
Subject: [PATCH] lint bash scripts.

Signed-off-by: Cyril Tovena <cyril.tovena@gmail.com>
---
 .../dev/loki-boltdb-storage-s3/compose-down.sh |  4 ++--
 tools/dev/loki-boltdb-storage-s3/compose-up.sh | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/dev/loki-boltdb-storage-s3/compose-down.sh b/tools/dev/loki-boltdb-storage-s3/compose-down.sh
index 39f37303e9f2..7e20021c792c 100755
--- a/tools/dev/loki-boltdb-storage-s3/compose-down.sh
+++ b/tools/dev/loki-boltdb-storage-s3/compose-down.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
 
-docker-compose -f ${SCRIPT_DIR}/docker-compose.yml down
+docker-compose -f "${SCRIPT_DIR}"/docker-compose.yml down  --remove-orphans
diff --git a/tools/dev/loki-boltdb-storage-s3/compose-up.sh b/tools/dev/loki-boltdb-storage-s3/compose-up.sh
index 400735a0f75c..df1077c4a0de 100755
--- a/tools/dev/loki-boltdb-storage-s3/compose-up.sh
+++ b/tools/dev/loki-boltdb-storage-s3/compose-up.sh
@@ -2,23 +2,23 @@
 
 set -e
 
-SCRIPT_DIR=$(cd `dirname $0` && pwd)
+SCRIPT_DIR=$(cd "$(dirname "$0")" && pwd)
 
-SRC_DEST=${SCRIPT_DIR}/.src/
+SRC_DEST="${SCRIPT_DIR}/.src/"
 # sync all sources for dlv
-rm -Rf ${SRC_DEST}
-mkdir ${SRC_DEST}
+rm -Rf "${SRC_DEST}"
+mkdir "${SRC_DEST}"
 for d in cmd pkg vendor clients
 do
-    cp -Rf ${SCRIPT_DIR}/../../../${d}/ ${SRC_DEST}/${d}/
+    cp -Rf "${SCRIPT_DIR}/../../../${d}/" "${SRC_DEST}/${d}/"
 done
 
 # build loki -gcflags "all=-N -l" disables optimizations that allow for better run with combination with Delve debugger.
-CGO_ENABLED=0 GOOS=linux go build -mod=vendor -gcflags "all=-N -l" -o ${SCRIPT_DIR}/loki ${SCRIPT_DIR}/../../../cmd/loki
+CGO_ENABLED=0 GOOS=linux go build -mod=vendor -gcflags "all=-N -l" -o "${SCRIPT_DIR}/loki" "${SCRIPT_DIR}/../../../cmd/loki"
 # ## install loki driver to send logs
 docker plugin install grafana/loki-docker-driver:latest --alias loki-compose --grant-all-permissions || true
 # build the compose image
-docker-compose -f ${SCRIPT_DIR}/docker-compose.yml build distributor
+docker compose -f "${SCRIPT_DIR}"/docker-compose.yml build distributor
 # cleanup sources
-rm -Rf ${SRC_DEST}
-docker-compose -f ${SCRIPT_DIR}/docker-compose.yml up $@
+rm -Rf "${SRC_DEST}"
+docker compose -f "${SCRIPT_DIR}"/docker-compose.yml up "$@"