fix: Incorrect error messages and namespace util functions

Author: hyperupcall

bake

@@ -346,9 +346,9 @@ __bake_main() {
 
 	set -ETeo pipefail
 	shopt -s dotglob extglob globasciiranges globstar lastpipe shift_verbose
-	export LANG='C' LC_CTYPE='C' LC_NUMERIC='C' LC_TIME='C' LC_COLLATE='C' LC_MONETARY='C' \
-		LC_MESSAGES='C' LC_PAPER='C' LC_NAME='C' LC_ADDRESS='C' LC_TELEPHONE='C' \
-		LC_MEASUREMENT='C' LC_IDENTIFICATION='C' LC_ALL='C'
+	export LANG='C' LC_CTYPE='C' LC_NUMERIC='C' LC_TIME='C' LC_COLLATE='C' \
+		LC_MONETARY='C' LC_MESSAGES='C' LC_PAPER='C' LC_NAME='C' LC_ADDRESS='C' \
+		LC_TELEPHONE='C' LC_MEASUREMENT='C' LC_IDENTIFICATION='C' LC_ALL='C'
 	trap '__bake_trap_err' 'ERR'
 	bake.cfg pedantic-task-cd 'no'
 

pkg/src/public/bash-core.sh

@@ -44,7 +44,7 @@ core.trap_add() {
 	fi; unset regex
 	signal_spec=${signal_spec#SIG}
 	if ! declare -f "$function" &>/dev/null; then
-		printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
+		printf '%s\n' "Error: core.trap_add: Function '$function' is not defined" >&2
 		return 1
 	fi
 
@@ -56,7 +56,7 @@ core.trap_add() {
 	printf -v global_trap_handler_name '%q' "core.trap_handler_${signal_spec}"
 
 	if ! eval "$global_trap_handler_name() {
-	core.trap_handler_common '$signal_spec'
+	core.util.trap_handler_common '$signal_spec'
 }"; then
 		printf '%s\n' "Error: core.trap_add: Could not eval function"
 		return 1
@@ -80,21 +80,21 @@ core.trap_remove() {
 
 	# validation
 	if [ -z "$function" ]; then
-		printf '%s\n' "Error: core.trap_add: First argument cannot be empty"
+		printf '%s\n' "Error: core.trap_remove: First argument cannot be empty"
 		return 1
 	fi
 	if [ -z "$signal_spec" ]; then
-		printf '%s\n' "Error: core.trap_add: Second argument cannot be empty"
+		printf '%s\n' "Error: core.trap_remove: Second argument cannot be empty"
 		return 1
 	fi
 	local regex='^[0-9]+$'
 	if [[ "$signal_spec" =~ $regex ]]; then
-		printf '%s\n' "Error: core.trap_add: Passing numbers for the signal specs is prohibited"
+		printf '%s\n' "Error: core.trap_remove: Passing numbers for the signal specs is prohibited"
 		return 1
 	fi; unset regex
 	signal_spec="${signal_spec#SIG}"
 	if ! declare -f "$function" &>/dev/null; then
-		printf '%s\n' "Error: core.trap_add: Function '$function' not defined" >&2
+		printf '%s\n' "Error: core.trap_remove: Function '$function' is not defined" >&2
 		return 1
 	fi
 
@@ -228,7 +228,7 @@ core.err_set() {
 }
 
 # @description Clears any of the global error state (sets to empty string).
-# This means any `core.err_exists` calls after this _will_ return `true`
+# This means any `core.err_exists` calls after this _will_ `return 1`
 # @noargs
 # @set number ERRCODE Error code
 # @set string ERR Error message

pkg/src/util/util.sh

@@ -1,6 +1,6 @@
 # shellcheck shell=bash
 
-core.trap_handler_common() {
+core.util.trap_handler_common() {
 	local signal_spec="$1"
 
 	local trap_handlers=

tests/trap.bats

@@ -10,7 +10,7 @@ load './util/init.sh'
 	run core.trap_add 'nonexistent' 'USR1'
 
 	assert_failure
-	assert_output -p "Function 'nonexistent' not defined"
+	assert_output -p "Function 'nonexistent' is not defined"
 }
 
 @test "Fails when number is given for signal" {