From 19bd8d3f5b643dfb0c555707956602e091458510 Mon Sep 17 00:00:00 2001
From: Matthias Kruk <m@m10k.eu>
Date: Sat, 19 Nov 2022 13:23:51 +0900
Subject: [PATCH] include/inst: Store the instance root directory in a variable

The directory that all instance directories are contained within is
not kept in a variable, causing several functions to construct the
path from TOOLBOX_HOME. Hence, the root directory is effectively
declared in more than one place.

This commit introduces the global variable `__inst_root', which
points to the directory that contains all instance data, making it
unnecessary to construct the path from TOOLBOX_HOME.
---
 include/inst.sh | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/inst.sh b/include/inst.sh
index 551b959..68b406f 100644
--- a/include/inst.sh
+++ b/include/inst.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # inst.sh - Toolbox module for daemonized scripts
-# Copyright (C) 2021 Matthias Kruk
+# Copyright (C) 2021-2022 Matthias Kruk
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -31,7 +31,8 @@ __init() {
 	fi
 
 	declare -xgr __inst_name="$name"
-	declare -xgr __inst_path="$TOOLBOX_HOME/inst/$__inst_name"
+	declare -xgr __inst_root="$TOOLBOX_HOME/inst"
+	declare -xgr __inst_path="$__inst_root/$__inst_name"
 
 	if ! mkdir -p "$__inst_path"; then
 		return 1
@@ -81,7 +82,7 @@ inst_list() {
 	if [[ -z "$instname" ]]; then
 		instname="$__inst_name"
 	fi
-	instpath="$TOOLBOX_HOME/inst/$instname"
+	instpath="$__inst_root/$instname"
 
 	while read -r sem; do
 		local owner
@@ -130,7 +131,7 @@ inst_stop() {
 	if [[ -z "$instname" ]]; then
 		instname="$__inst_name"
 	fi
-	instpath="$TOOLBOX_HOME/inst/$instname"
+	instpath="$__inst_root/$instname"
 
 	sem="$instpath/$pid"
 
@@ -237,7 +238,7 @@ inst_get_status() {
 	if [[ -z "$instname" ]]; then
 		instname="$__inst_name"
 	fi
-	instpath="$TOOLBOX_HOME/inst/$instname"
+	instpath="$__inst_root/$instname"
 
 	if ! status=$(< "$instpath/$pid.status"); then
 		log_error "Could not read from $instpath/$pid.status"
@@ -283,7 +284,7 @@ inst_count() {
 	if [[ -z "$instname" ]]; then
 		instname="$__inst_name"
 	fi
-	instpath="$TOOLBOX_HOME/inst/$instname"
+	instpath="$__inst_root/$instname"
 
         if ! num=$(find "$instpath" -regex ".*/[0-9]+" | wc -l); then
                 return 1
-- 
2.47.3