Merge branch 'main' of github.com:hyperupcall/bash-core

Author: hyperupcall

bake

@@ -311,7 +311,6 @@ __bake_main() {
 		__bake_internal_die 'Failed to shift'
 	fi
 
-	# shellcheck disable=SC1007
 	local __bake_key= __bake_value=
 	local __bake_arg=
 	for __bake_arg; do case $__bake_arg in

basalt.toml

@@ -2,13 +2,13 @@
 type = 'bash'
 name = 'bash-core'
 slug = 'core'
-version = '0.2.0'
+version = '0.3.2'
 authors = ['Edwin Kofler <edwin@kofler.dev>']
 description = 'Core lightweight functions that any Bash programmer will love'
 
 [run]
 dependencies = ['https://github.com/hyperupcall/bats-all.git@v4.1.0']
-sourceDirs = ['pkg/src/public']
+sourceDirs = ['pkg/src/public', 'pkg/src/util']
 builtinDirs = []
 binDirs = []
 completionDirs = []

docs/api.md

@@ -133,12 +133,12 @@ Prints stacktrace
 #### Example
 
 ```bash
-core.trap_add 'err_handler' EXIT
 err_handler() {
   local exit_code=$?
   core.stacktrace_print
-  exit $?
+  exit $exit_code
 }
+core.trap_add 'err_handler' ERR
 ```
 
 _Function has no arguments._

pkg/src/public/bash-core.sh

@@ -44,7 +44,7 @@ core.trap_add() {
 		printf '%s\n' "Error: core.trap_add: Passing numbers for the signal specs is prohibited"
 		return 1
 	fi; unset regex
-	signal_spec="${signal_spec#SIG}"
+	signal_spec=${signal_spec#SIG}
 	if ! declare -f "$function" &>/dev/null; then
 		printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
 		return 1
@@ -55,10 +55,10 @@ core.trap_add() {
 
 	# rho (WET)
 	local global_trap_handler_name=
-	printf -v global_trap_handler_name '%q' "___global_trap_${signal_spec}_handler___"
+	printf -v global_trap_handler_name '%q' "core.trap_handler_${signal_spec}"
 
 	if ! eval "$global_trap_handler_name() {
-	core.trap_common_global_handler '$signal_spec'
+	core.trap_handler_common '$signal_spec'
 }"; then
 		printf '%s\n' "Error: core.trap_add: Could not eval function"
 		return 1
@@ -253,12 +253,12 @@ core.err_exists() {
 # @description Prints stacktrace
 # @noargs
 # @example
-#  core.trap_add 'err_handler' EXIT
 #  err_handler() {
 #    local exit_code=$?
 #    core.stacktrace_print
-#    exit $?
+#    exit $exit_code
 #  }
+#  core.trap_add 'err_handler' ERR
 core.stacktrace_print() {
 	printf '%s\n' 'Stacktrace:'
 

pkg/src/util/util.sh

@@ -0,0 +1,21 @@
+# shellcheck shell=bash
+
+core.trap_handler_common() {
+	local signal_spec="$1"
+
+	local trap_handlers=
+	IFS=$'\x1C' read -ra trap_handlers <<< "${___global_trap_table___[$signal_spec]}"
+
+	local trap_handler=
+	for trap_handler in "${trap_handlers[@]}"; do
+		if [ -z "$trap_handler" ]; then
+			continue
+		fi
+
+		if declare -f "$trap_handler" &>/dev/null; then
+			"$trap_handler"
+		else
+			printf "%s\n" "Warn: core.trap_add: Function '$trap_handler' registered for signal '$signal_spec' no longer exists. Skipping" >&2
+		fi
+	done; unset trap_func
+}