fix: Formatting of printed errors and help menus

Author: hyperupcall

pkg/lib/cmd/basalt-package-init.sh

@@ -34,12 +34,12 @@ EOF
 		if [ -L "$__basalt_file" ]; then
 			local __basalt_target="$(readlink "$__basalt_file")"
 			if ! cd "${__basalt_target%/*}"; then
-				printf '%s\n' "Error: basalt-package-init: Could not cd to '${__basalt_target%/*}'"
+				printf '%s\n' "Error: basalt.package-init: Could not cd to '${__basalt_target%/*}'"
 				return 1
 			fi
 		else
 			if ! cd "${__basalt_file%/*}"; then
-				printf '%s\n' "Error: basalt-package-init: Could not cd to '${__basalt_file%/*}'"
+				printf '%s\n' "Error: basalt.package-init: Could not cd to '${__basalt_file%/*}'"
 				return 1
 			fi
 		fi
@@ -57,16 +57,16 @@ EOF
 
 			printf '%s' "$PWD"
 		)"; then
-			printf '%s\n' "Error: basalt-package-init: Could not find basalt.toml"
+			printf '%s\n' "Error: basalt.package-init: Could not find basalt.toml"
 			if ! cd "$__old_cd"; then
-				printf '%s\n' "Error: basalt-package-init: Could not cd back to '$__old_cd'"
+				printf '%s\n' "Error: basalt.package-init: Could not cd back to '$__old_cd'"
 				return 1
 			fi
 			return 1
 		fi
 
 		if ! cd "$__old_cd"; then
-			printf '%s\n' "Error: basalt-package-init: Could not cd back to '$__old_cd'"
+			printf '%s\n' "Error: basalt.package-init: Could not cd back to '$__old_cd'"
 			return 1
 		fi
 	fi

pkg/lib/public/basalt-global.sh

@@ -19,30 +19,23 @@ basalt.load() {
 		;;
 	--help|-h)
 		cat <<-"EOF"
-		basalt.load Load a particular file
-
 		Usage:
-		  basalt-load [flags] <package> [file]
+		  basalt.load [flags] <package> <file>
 
 		Flags:
-		  --global
-		    Use packages installed globally, rather than local packages
-
-		  --dry
-		    Only print what would have been sourced
-
-		  --help
-		    Print help menu
+		  --global  Use global packages rather than local packages
+		  --dry     Only print what would have been sourced
+		  --help    Print help
 
 		Example:
-		  basalt-load --global 'github.com/rupa/z' 'z.sh'
-		  basalt-load --dry 'github.com/hyperupcall/bats-common-utils' 'load.bash'
-		  basalt-load 'github.com/bats-core/bats-assert' 'load.bash'
+		  basalt.load --global 'github.com/rupa/z' 'z.sh'
+		  basalt.load --dry 'github.com/hyperupcall/bats-common-utils' 'load.bash'
+		  basalt.load 'github.com/bats-core/bats-assert' 'load.bash'
 		EOF
 		return
 		;;
 	-*)
-		printf '%s\n' "Error: basalt.load Flag '$arg' not recognized"
+		printf '%s\n' "Error: basalt.load: Flag '$arg' not recognized"
 		return 1
 		;;
 	esac done
@@ -51,7 +44,7 @@ basalt.load() {
 	local __basalt_file="${2:-}"
 
 	if [ -z "$__basalt_pkg_path" ]; then
-		printf '%s\n' "Error: basalt.load Missing package as first parameter"
+		printf '%s\n' "Error: basalt.load: Missing package as first parameter"
 		return 1
 	fi
 
@@ -86,9 +79,9 @@ basalt.load() {
 	if [ -z "$__basalt_pkg_path_full" ] || [ ! -d "$__basalt_pkg_path_full" ]; then
 		local __basalt_str='locally'
 		if [ "$__basalt_flag_global" = 'yes' ]; then
-			__basalt_str=" globally"
+			__basalt_str="globally"
 		fi
-		printf '%s\n' "Error: basalt.load: Package '$__basalt_pkg_path' is not installed$__basalt_str"
+		printf '%s\n' "Error: basalt.load: Package '$__basalt_pkg_path' is not installed $__basalt_str"
 
 		return 1
 	fi

pkg/lib/public/basalt-package.sh

@@ -7,7 +7,7 @@ basalt.package-load() {
 	local __basalt_shopt_nullglob=
 
 	if [ -z "${BASALT_PACKAGE_DIR:-}" ]; then
-		printf '%s\n' "Error: basalt.package-load: Variable 'BASALT_PACKAGE_DIR' is empty"
+		printf '%s\n' "Error: basalt.package-load: Variable '\$BASALT_PACKAGE_DIR' is empty"
 		return 1
 	fi
 
@@ -31,7 +31,11 @@ basalt.package-load() {
 					fi
 
 					if [ -f "$__basalt_package.basalt/generated/source_package.sh" ]; then
-						source "$__basalt_package.basalt/generated/source_package.sh"
+						if ! source "$__basalt_package.basalt/generated/source_package.sh"; then
+							:
+						else
+							return $?
+						fi
 					fi
 
 					shopt -s nullglob

pkg/lib/util/util.sh

@@ -47,7 +47,7 @@ util.init_global() {
 		touch "$BASALT_GLOBAL_DATA_DIR/global/dependencies"
 	fi
 
-	# Note that I would prefer to check the existence of the target directory as well, but that would mean if the user installs
+	# I would prefer to check the existence of the target directory as well, but that would mean if the user installs
 	# a package that creates for example a 'completion' directory, it would not show up until 'basalt' is executed again
 	if [ ! -L "$BASALT_GLOBAL_DATA_DIR/global/bin" ]; then
 		ln -sf "$BASALT_GLOBAL_DATA_DIR/global/.basalt/packages/bin" "$BASALT_GLOBAL_DATA_DIR/global/bin"
@@ -333,9 +333,6 @@ util.text_dependency_is_installed() {
 
 util.show_help() {
 	cat <<"EOF"
-Basalt:
-  The rock-solid Bash package manager
-
 Usage:
   basalt [--help|--version]
   basalt <local-subcommand> [args...]