From 9ae72ed6fcecc02d52d1a6af325c6d5a499cabca Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sat, 20 May 2023 15:59:37 +0200
Subject: [PATCH] matrix/synapse : incoherences residuelles

---
 podman-matrix/05_freshinstall.sh | 5 +++--
 podman-matrix/10_install.sh      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/podman-matrix/05_freshinstall.sh b/podman-matrix/05_freshinstall.sh
index 303d1f6..53994f7 100755
--- a/podman-matrix/05_freshinstall.sh
+++ b/podman-matrix/05_freshinstall.sh
@@ -15,8 +15,9 @@ if podman volume exists ${confvolume} || podman volume exists ${dbvolume}; then
 	exit 1
 fi
 
-podman image pull ${synapse_image}:${synapse_version} &&
-podman image exists ${synapse_image}:${synapse_version} &&
+if ! podman image exists ${synapse_image}:${synapse_version}; then
+    podman image pull ${synapse_image}:${synapse_version} || exit 1
+fi
 podman volume create ${confvolume} &&
 podman volume create ${dbvolume} &&
 podman container run -it --name ${container_name}-generate --mount type=volume,src=${confvolume},dst=/data -e SYNAPSE_SERVER_NAME=${GARBAYE_MATRIX_DOMAIN} -e SYNAPSE_REPORT_STATS=no ${synapse_image}:${synapse_version} generate &&
diff --git a/podman-matrix/10_install.sh b/podman-matrix/10_install.sh
index 00cef75..5e0c2d8 100755
--- a/podman-matrix/10_install.sh
+++ b/podman-matrix/10_install.sh
@@ -20,7 +20,7 @@ if ! podman volume exists ${dbvolume} ; then
     exit 1
 fi
 
-if ! podman image pull ${synapse_image}:${synapse_version}; then
+if ! podman image exists ${synapse_image}:${synapse_version}; then
     podman image pull ${synapse_image}:${synapse_version} || exit 1
 fi
 podman image pull ${postgres_image}:${postgres_version} &&