From 603bf228463159f801b938043bd297b4ce69e7e2 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Sun, 6 Jun 2021 14:52:33 +0200
Subject: [PATCH] podman-jitsi : tilde no good

---
 podman-jitsi/05_freshinstall.sh | 22 +++++++++++-----------
 podman-jitsi/10_install.sh      |  4 ++--
 podman-jitsi/90_prune.sh        |  2 +-
 podman-jitsi/vars.sh            |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/podman-jitsi/05_freshinstall.sh b/podman-jitsi/05_freshinstall.sh
index dee6bcc..fe2e39a 100755
--- a/podman-jitsi/05_freshinstall.sh
+++ b/podman-jitsi/05_freshinstall.sh
@@ -7,22 +7,22 @@ source ${ABSDIR}/vars.sh
 ensure_pwd_is_scriptdir
 ensure_not_root
 
-if [[ -d ${confvolume} ]]; then
-    echo "Error : conf volume ${confvolume} already exists. Please remove it first (prune?)."
+if [[ -d ~/${confvolume} ]]; then
+    echo "Error : conf volume ~/${confvolume} already exists. Please remove it first (prune?)."
     exit 1
 fi
 
-mkdir -p ${confvolume}/{web/letsencrypt,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
+mkdir -p ~/${confvolume}/{web/letsencrypt,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
 
 ${ABSDIR}/10_install.sh
 
 # Patch config.js
-sed_in_place "^        enabled: true," "        enabled: false," ${confvolume}/web/config.js
-sed_in_place "^    // enableInsecureRoomNameWarning: false," "    enableInsecureRoomNameWarning: true," ${confvolume}/web/config.js
-sed_in_place "^    // disableThirdPartyRequests: false," "    disableThirdPartyRequests: true," ${confvolume}/web/config.js
-sed_in_place "^    // remoteVideoMenu: {" "    remoteVideoMenu: {\n        disableKick: false,\n        disableGrantModerator: false,\n    }," ${confvolume}/web/config.js
+sed_in_place "^        enabled: true," "        enabled: false," ~/${confvolume}/web/config.js
+sed_in_place "^    // enableInsecureRoomNameWarning: false," "    enableInsecureRoomNameWarning: true," ~/${confvolume}/web/config.js
+sed_in_place "^    // disableThirdPartyRequests: false," "    disableThirdPartyRequests: true," ~/${confvolume}/web/config.js
+sed_in_place "^    // remoteVideoMenu: {" "    remoteVideoMenu: {\n        disableKick: false,\n        disableGrantModerator: false,\n    }," ~/${confvolume}/web/config.js
 
-# Patch ${confvolume}/web/interface_config.js
-sed_in_place "^    APP_NAME: 'Jitsi Meet'," "    APP_NAME: 'Jitsi Garbaye'," ${confvolume}/web/interface_config.js
-sed_in_place "^    DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster'," "    DEFAULT_REMOTE_DISPLAY_NAME: 'Participant'," ${confvolume}/web/interface_config.js
-sed_in_place "^    JITSI_WATERMARK_LINK: 'https://jitsi.org'," "    JITSI_WATERMARK_LINK: '${GARBAYE_JITSI_URL}'," ${confvolume}/web/interface_config.js
+# Patch ~/${confvolume}/web/interface_config.js
+sed_in_place "^    APP_NAME: 'Jitsi Meet'," "    APP_NAME: 'Jitsi Garbaye'," ~/${confvolume}/web/interface_config.js
+sed_in_place "^    DEFAULT_REMOTE_DISPLAY_NAME: 'Fellow Jitster'," "    DEFAULT_REMOTE_DISPLAY_NAME: 'Participant'," ~/${confvolume}/web/interface_config.js
+sed_in_place "^    JITSI_WATERMARK_LINK: 'https://jitsi.org'," "    JITSI_WATERMARK_LINK: '${GARBAYE_JITSI_URL}'," ~/${confvolume}/web/interface_config.js
diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index 3ad92b3..8c1d9dc 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -7,8 +7,8 @@ source ${ABSDIR}/vars.sh
 ensure_pwd_is_scriptdir
 ensure_not_root
 
-if [[ ! -d ${confvolume} ]]; then
-    echo "Error : conf volume ${confvolume} does not exists. Consider running 05_freshinstall.sh if this is the first install."
+if [[ ! -d ~/${confvolume} ]]; then
+    echo "Error : conf volume ~/${confvolume} does not exists. Consider running 05_freshinstall.sh if this is the first install."
     exit 1
 fi
 
diff --git a/podman-jitsi/90_prune.sh b/podman-jitsi/90_prune.sh
index 0cfbe3b..70852e5 100755
--- a/podman-jitsi/90_prune.sh
+++ b/podman-jitsi/90_prune.sh
@@ -17,7 +17,7 @@ ensure_pod_not_exists ${pod_name}
 ensure_systemd_unit_not_exists ${service_name}
 
 # remove date
-podman unshare rm -rf ${confvolume}/
+podman unshare rm -rf ~/${confvolume}/
 
 # remove images
 for image in ${upstream_images} ; do
diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh
index 68645ce..1921d3c 100644
--- a/podman-jitsi/vars.sh
+++ b/podman-jitsi/vars.sh
@@ -4,5 +4,5 @@ pod_name='podman-jitsi'
 service_name="pod-${pod_name}.service"
 upstream_images="docker.io/jitsi/jvb docker.io/jitsi/jicofo docker.io/jitsi/prosody docker.io/jitsi/web"
 version='stable-5870'
-confvolume='~/.jitsi-meet-cfg'
+confvolume='.jitsi-meet-cfg'
 GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"