From d55809628886b44f265f05b9da02f11586a99049 Mon Sep 17 00:00:00 2001
From: Yasen Pramatarov <yasen@lindeas.com>
Date: Tue, 4 Jun 2024 20:38:00 +0300
Subject: [PATCH] Adds SCRIPT_DIR to replace relative paths for conf, db, etc.

---
 jilo      | 6 ++++--
 jilo-cli  | 8 +++++---
 jilo.conf | 4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/jilo b/jilo
index 24ef035..06c0196 100755
--- a/jilo
+++ b/jilo
@@ -6,8 +6,10 @@
 # Bash script for Jitsi Meet components (Videobridge, Jicofo, etc.) logs parsing
 ###
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" #"
+
 ### Configuration file (overrides default configs)
-CONFIG_FILE="./jilo.conf"
+CONFIG_FILE="$SCRIPT_DIR/jilo.conf"
 
 ### Default configuration
 
@@ -19,7 +21,7 @@ DEFAULT_JICOFO_PROCESS="jicofo"
 # Default database type (sqlite, mysql|mariadb)
 DEFAULT_DB_TYPE="sqlite"
 # Default SQLite database file
-DEFAULT_DB="./jilo.db"
+DEFAULT_DB="$SCRIPT_DIR/jilo.db"
 # Default MySQL/MariaDB configuration
 DEFAULT_MYSQL_HOST="localhost"
 DEFAULT_MYSQL_USER="jilo"
diff --git a/jilo-cli b/jilo-cli
index cd6c262..80902f1 100755
--- a/jilo-cli
+++ b/jilo-cli
@@ -7,15 +7,17 @@
 # Command line interface (jilo-cli)
 ###
 
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" #"
+
 ### Configuration file (overrides default configs)
-CONFIG_FILE="./jilo.conf"
+CONFIG_FILE="$SCRIPT_DIR/jilo.conf"
 
 ### Default configuration
 
 # Default database type (sqlite, mysql|mariadb)
 DEFAULT_DB_TYPE="sqlite"
 # Default SQLite database file
-DEFAULT_DB="./jilo.db"
+DEFAULT_DB="$SCRIPT_DIR/jilo.db"
 # Default MySQL/MariaDB configuration
 DEFAULT_MYSQL_HOST="localhost"
 DEFAULT_MYSQL_USER="jilo"
@@ -265,8 +267,8 @@ case "$cmd" in
         if [[ "$time_range_specified" == true ]]; then
             db_stats_conferences_time=$(printf "$db_stats_conferences_time_template" "$from_time" "$until_time")
             db_query "$db_stats_conferences_time"
+            exit 0
         fi
-        exit 0
         ;;
 
     *)
diff --git a/jilo.conf b/jilo.conf
index 078441d..377a16e 100644
--- a/jilo.conf
+++ b/jilo.conf
@@ -3,5 +3,5 @@
 # the values here override the default ones in JILO
 ###
 
-JVB_LOGFILE="./jvb.log"
-JICOFO_LOGFILE="./jicofo.log"
+JVB_LOGFILE="$SCRIPT_DIR/jvb.log"
+JICOFO_LOGFILE="$SCRIPT_DIR/jicofo.log"