From 1c63d46d6d0ee4c84e37fb9af395ea1d6297f126 Mon Sep 17 00:00:00 2001
From: Armin Co <armin.co@hs-bochum.de>
Date: Sun, 25 Oct 2020 21:21:17 +0100
Subject: [PATCH] Fixing strings
---
config.sh | 4 ++--
setup.sh | 2 +-
tools/update_containers.sh | 6 +++---
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.sh b/config.sh
index 96f91a6..82685b2 100755
--- a/config.sh
+++ b/config.sh
@@ -43,7 +43,7 @@ fi
NOVNC_DIR=novnc
NOVNC_URL="$GIT_URL$NOVNC_DIR".git
if [ "$USE_NOVNC" == "true" ]; then
-novnc_compose_file=" -f ./novnc/docker-compose.yml "
+novnc_compose_file=" -f novnc/docker-compose.yml "
DOCKER_COMPOSE_FILES+=$"$novnc_compose_file"
fi
@@ -51,7 +51,7 @@ fi
MUMBLE_DIR=build-mumble-web
MUMBLE_URL=https://github.com/Johni0702/mumble-web.git
if [ "$USE_MUMBLE" == "true" ]; then
-mumble_compose_file=" -f ./build-mumble-web/docker-compose.production.yml"
+mumble_compose_file=" -f build-mumble-web/docker-compose.production.yml"
DOCKER_COMPOSE_FILES+=$"$mumble_compose_file"
SUB_DOMAINS+="mumble-web"
fi
diff --git a/setup.sh b/setup.sh
index c8b7838..c051361 100755
--- a/setup.sh
+++ b/setup.sh
@@ -64,7 +64,7 @@ clone_repositories
if [ "$USE_JITSI" == "true" ]; then
git clone $JITSI_URL
- ./"JITSI_DIR"/setup.sh
+ ./"$JITSI_DIR"/setup.sh
fi
configure_letsencrypt
diff --git a/tools/update_containers.sh b/tools/update_containers.sh
index d889608..0674382 100755
--- a/tools/update_containers.sh
+++ b/tools/update_containers.sh
@@ -8,17 +8,17 @@ echo "Pulling images"
echo ""
# pull updated images
-docker-compose $docker_compose_files pull
+docker-compose "$docker_compose_files" pull
echo "Building images"
echo ""
# Build new images if neccessary
if [ "$USE_MUMBLE" == "true" ]; then
- docker-compose -f $mumble_compose_file build
+ docker-compose -f "$mumble_compose_file" build
fi
if [ "$USE_NOVNC" == "true" ]; then
- docker-compose -f $novnc_compose_file build
+ docker-compose -f "$novnc_compose_file" build
fi
--
GitLab