From 573fc9faf4564e99a32524daca3b946ec8bbcafd Mon Sep 17 00:00:00 2001
From: Ismo Vuorinen <ismo@ivuorinen.net>
Date: Wed, 26 Feb 2025 00:10:50 +0200
Subject: [PATCH] chore(dfm): cleanup, fixes

---
 local/dfm/dfm           | 28 ++++++++++++++++------------
 local/dfm/lib/common.sh |  2 +-
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/local/dfm/dfm b/local/dfm/dfm
index 3849215..fb49729 100755
--- a/local/dfm/dfm
+++ b/local/dfm/dfm
@@ -4,18 +4,22 @@
 set -euo pipefail
 
 # define default variables
-readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-readonly CMD_DIR="${SCRIPT_DIR}/cmd"
-readonly LIB_DIR="${SCRIPT_DIR}/lib"
-readonly DEFAULT_CONFIG_PATH="$HOME/.config"
-readonly MAX_RETRIES=3
-export DEFAULT_INSTALL_DIR="$HOME/.local"
-export DEFAULT_VERBOSE=0
-export TEMP_DIR=$(mktemp -d)
+DFM_SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+readonly DFM_SCRIPT_DIR
+readonly DFM_CMD_DIR="${DFM_SCRIPT_DIR}/cmd"
+readonly DFM_LIB_DIR="${DFM_SCRIPT_DIR}/lib"
+readonly DFM_DEFAULT_CONFIG_PATH="$HOME/.config"
+export DFM_DEFAULT_CONFIG_PATH
+readonly DFM_MAX_RETRIES=3
+export DFM_MAX_RETRIES
+export DFM_DEFAULT_INSTALL_DIR="$HOME/.local"
+export DFM_DEFAULT_VERBOSE=0
+TEMP_DIR=$(mktemp -d)
+export TEMP_DIR
 
 # Load the common and utility functions from the lib directory.
-source "${LIB_DIR}/common.sh"
-source "${LIB_DIR}/utils.sh"
+source "${DFM_LIB_DIR}/common.sh"
+source "${DFM_LIB_DIR}/utils.sh"
 
 # Main function for the dfm script.
 #
@@ -37,8 +41,8 @@ main()
   shift
 
   if [[ $# -eq 0 ]]; then
-    # Näytä komennon saatavilla olevat funktiot
-    local cmd_file="${CMD_DIR}/${cmd}.sh"
+    # Show the available functions for the command
+    local cmd_file="${DFM_CMD_DIR}/${cmd}.sh"
     if [[ -f "$cmd_file" ]]; then
       list::print_group "Available functions for '$cmd'"
       list::loop_functions "$cmd_file"
diff --git a/local/dfm/lib/common.sh b/local/dfm/lib/common.sh
index 64934c4..3044765 100755
--- a/local/dfm/lib/common.sh
+++ b/local/dfm/lib/common.sh
@@ -107,7 +107,7 @@ lib::error::throw()
   local message=$*
 
   lib::error "$message"
-  return "${ERROR_CODES[$code_name]}"
+  cleanup "${ERROR_CODES[$code_name]}"
 }
 
 # Logs a message to the console if the current log level is set so that the