From 91495dc51f25a533a1c088b91f36e1bdbc843a1c Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Tue, 9 Jun 2020 22:51:24 +0200
Subject: [PATCH] [PicaPlume] And again... forgot quotes...
---
docker_test.sh | 5 ++---
pica-plume/entrypoint.sh | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/docker_test.sh b/docker_test.sh
index f1819cb1..283b8140 100755
--- a/docker_test.sh
+++ b/docker_test.sh
@@ -1,7 +1,5 @@
#!/bin/bash
-set -e
-
usage() {
echo -e "usage:\t$0 DIRECTORY, e.g. $0 pica-mattermost"
echo -e "\tDIRECTORY : name of the directory containing docker-compose.yml\n"
@@ -83,7 +81,8 @@ done
echo -e "\n==== Remove and re-create named external volumes ===="
for v in $(docker-compose config --volumes); do
- if [ grep $v -A 1 docker-compose.yml | grep 'external' ]; then
+ res=$(grep $v -A 1 docker-compose.yml | grep 'external' || true)
+ if [ ! -z $res ]; then
# Don't fail if volume does not exists
docker volume rm "$v" || true
docker volume create "$v"
diff --git a/pica-plume/entrypoint.sh b/pica-plume/entrypoint.sh
index a5e8ab86..c9115d90 100755
--- a/pica-plume/entrypoint.sh
+++ b/pica-plume/entrypoint.sh
@@ -45,7 +45,7 @@ if [ ! -f ${FIRSTLAUNCH_PATH} ]; then
fi
# Check if we updated since last launch
-if [ "${PLUME_VERSION}" != $(cat ${FIRSTLAUNCH_PATH}) ]; then
+if [ "${PLUME_VERSION}" != "$(cat ${FIRSTLAUNCH_PATH})" ]; then
# If so, we need to run migrations
echo "Instance updated since last launch, running migrations..."
plm migration run
--
GitLab