From 67a941b9c1c5e5cdce7c94c28df58bd1bff7bf63 Mon Sep 17 00:00:00 2001
From: Martin Bagge / brother <brother@bsnet.se>
Date: Sat, 11 Apr 2020 19:21:55 +0200
Subject: [PATCH] misc: update gen-passwords.sh shell code

---
 gen-passwords.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/gen-passwords.sh b/gen-passwords.sh
index bd54e21..c05a07b 100755
--- a/gen-passwords.sh
+++ b/gen-passwords.sh
@@ -4,12 +4,12 @@ function generatePassword() {
     openssl rand -hex 16
 }
 
-JICOFO_COMPONENT_SECRET=`generatePassword`
-JICOFO_AUTH_PASSWORD=`generatePassword`
-JVB_AUTH_PASSWORD=`generatePassword`
-JIGASI_XMPP_PASSWORD=`generatePassword`
-JIBRI_RECORDER_PASSWORD=`generatePassword`
-JIBRI_XMPP_PASSWORD=`generatePassword`
+JICOFO_COMPONENT_SECRET=$(generatePassword)
+JICOFO_AUTH_PASSWORD=$(generatePassword)
+JVB_AUTH_PASSWORD=$(generatePassword)
+JIGASI_XMPP_PASSWORD=$(generatePassword)
+JIBRI_RECORDER_PASSWORD=$(generatePassword)
+JIBRI_XMPP_PASSWORD=$(generatePassword)
 
 sed -i.bak \
     -e "s#JICOFO_COMPONENT_SECRET=.*#JICOFO_COMPONENT_SECRET=${JICOFO_COMPONENT_SECRET}#g" \
@@ -18,4 +18,4 @@ sed -i.bak \
     -e "s#JIGASI_XMPP_PASSWORD=.*#JIGASI_XMPP_PASSWORD=${JIGASI_XMPP_PASSWORD}#g" \
     -e "s#JIBRI_RECORDER_PASSWORD=.*#JIBRI_RECORDER_PASSWORD=${JIBRI_RECORDER_PASSWORD}#g" \
     -e "s#JIBRI_XMPP_PASSWORD=.*#JIBRI_XMPP_PASSWORD=${JIBRI_XMPP_PASSWORD}#g" \
-    .env
+    "$(dirname "$0")/.env"