ivuorinen/dotfiles
1
0
Fork 0
mirror of https://github.com/ivuorinen/dotfiles.git synced 2026-02-17 05:54:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dfm): update traps and tests (#124)

Browse Source 
* fix(dfm): update traps and tests

* fix(dfm): initialize defaults and secure tests

* fix(tests): secure helper quoting and extend install coverage

* fix(utils): avoid double extension when resolving command

* fix(tests): quote paths and add strict mode

* fix(utils): escape function name in regex
This commit is contained in:
Ismo Vuorinen
2025-06-11 23:44:52 +03:00
parent 76076fdaa4
commit 1d0ea5ace4
6 changed files with 111 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
local/dfm/lib/common.sh
View File

@@ -331,49 +331,22 @@ logger::error()
#
# Example:
# trap cleanup EXIT
cleanup()
{
local exit_code=$?
[ -d "$TEMP_DIR" ] && rm -rf "$TEMP_DIR"
exit $exit_code
cleanup() {
local exit_code=${1:-$?}
if [[ -n ${TEMP_DIR:-} && -d $TEMP_DIR ]]; then
rm -rf "$TEMP_DIR"
fi
exit "$exit_code"
}
# Register the cleanup function to run on EXIT signal.
#
# This will ensure that temporary files and directories are removed
# when the script exits or is interrupted by a signal (e.g. Ctrl+C).
# The cleanup function is defined above.
# This ensures temporary files and directories are removed
# when the script exits or is interrupted.
trap cleanup EXIT
# Handle errors by logging an error message to the console.
#
# The function is registered with the `ERR` trap.
# The line number where the error occurred is passed as an argument to the function.
# The function is defined above.
#
# @description Handle an error
# @param $1 Line number
# Handles an error event by logging the line number and corresponding exit code.
#
# Globals:
# $? - The exit code of the last executed command.
#
# Arguments:
# $1 - The line number where the error occurred.
#
# Outputs:
# Logs an error message to STDERR via logger::error.
#
# Returns:
# None
# The `ERR` trap passes the line number and command to lib::error::handle.
#
# Example:
# handle_error ${LINENO}
handle_error()
{
local exit_code=$?
local line_no=$1
logger::error "Failed at line ${line_no} with exit code ${exit_code}"
}
trap 'handle_error ${LINENO}' ERR
# lib::error::handle ${LINENO} "$BASH_COMMAND"
trap 'lib::error::handle ${LINENO} "$BASH_COMMAND"' ERR

18
local/dfm/lib/utils.sh
View File

@@ -673,19 +673,21 @@ main::get_command_functions()
# desc=$(main::get_function_description "install" "my_function")
main::get_function_description()
{
local cmd="$1"
local cmd_file="$1"
local func="$2"
local cmd_file="${DFM_CMD_DIR}/${cmd}.sh"
if [[ ! -f "$cmd_file" && -f "$cmd" ]]; then
cmd_file="$cmd"
fi
if [[ ! -f "$cmd_file" ]]; then
return 1
[[ -n ${DFM_CMD_DIR:-} ]] || return 1
cmd_file="${DFM_CMD_DIR}/${cmd_file}"
[[ "$cmd_file" == *.sh ]] || cmd_file="${cmd_file}.sh"
fi
grep -B1 "^[[:space:]]*\(function[[:space:]]*\)\{0,1\}$func().*{" "$cmd_file" \
[[ -f "$cmd_file" ]] || return 1
local escaped_func
escaped_func=$(printf '%s' "$func" | sed 's/[][\\.^$*+?(){}|]/\\&/g')
grep -B5 -E "^[[:space:]]*(function[[:space:]]*)?${escaped_func}[[:space:]]*\\(\\)[[:space:]]*(\\{)?[[:space:]]*$" "$cmd_file" \
| grep "@description" \
| sed -E 's/^[[:space:]]*#[[:space:]]*@description[[:space:]]*//'
}