refactor: Use proper function names for pkg.phase* functions

Author: hyperupcall

pkg/lib/util/pkg.sh

@@ -41,8 +41,8 @@ pkg.install_package() {
 		local package_id="$REPLY"
 
 		# Download, extract
-		pkg.phase-download_tarball "$repo_type" "$url" "$site" "$package" "$version"
-		pkg.phase-extract_tarball "$package_id"
+		pkg.phase_download_tarball "$repo_type" "$url" "$site" "$package" "$version"
+		pkg.phase_extract_tarball "$package_id"
 
 		# Install transitive dependencies if they exist
 		if [ -f "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id/basalt.toml" ]; then
@@ -52,19 +52,19 @@ pkg.install_package() {
 		fi
 
 		# Only after all the dependencies are installed do we muck with the package
-		pkg.phase-global-integration "$package_id"
+		pkg.phase_global-integration "$package_id"
 	done
 	unset pkg
 
 	# Only if all the previous modifications to the global package store has been successfull
 	# do we muck with the current local project
-	pkg.phase-local-integration "$project_dir" 'yes' "$symlink_mode" "$@"
-	pkg.phase-local-generate-scripts "$project_dir"
+	pkg.phase_local-integration "$project_dir" 'yes' "$symlink_mode" "$@"
+	pkg.phase_local-generate-scripts "$project_dir"
 }
 
 # @description Downloads package tarballs from the internet to the global store. If a git revision is specified, it
 # will extract that revision after cloning the repository and using git-archive
-pkg.phase-download_tarball() {
+pkg.phase_download_tarball() {
 	local repo_type="$1"
 	local url="$2"
 	local site="$3"
@@ -139,7 +139,7 @@ pkg.phase-download_tarball() {
 }
 
 # @description Extracts the tarballs in the global store to a directory
-pkg.phase-extract_tarball() {
+pkg.phase_extract_tarball() {
 	local package_id="$1"
 	ensure.nonzero 'package_id'
 
@@ -172,7 +172,7 @@ pkg.phase-extract_tarball() {
 
 # TODO: properly cache transformations
 # @description This performs modifications a particular package in the global store
-pkg.phase-global-integration() {
+pkg.phase_global-integration() {
 	local package_id="$1"
 	ensure.nonzero 'package_id'
 
@@ -186,16 +186,16 @@ pkg.phase-global-integration() {
 	if [ -f "$project_dir/basalt.toml" ]; then
 		# Install dependencies
 		if util.get_toml_array "$project_dir/basalt.toml" 'dependencies'; then
-			pkg.phase-local-integration "$project_dir" 'yes' 'strict' "${REPLIES[@]}"
-			pkg.phase-local-generate-scripts "$project_dir"
+			pkg.phase_local-integration "$project_dir" 'yes' 'strict' "${REPLIES[@]}"
+			pkg.phase_local-generate-scripts "$project_dir"
 		fi
 	fi
 
 	print.indent-green "Transformed" "$package_id"
 }
 
 # Create a './.basalt' directory for a particular project directory
-pkg.phase-local-integration() {
+pkg.phase_local-integration() {
 	unset REPLY; REPLY=
 	local original_package_dir="$1"
 	local is_direct="$2" # Whether the "$package_dir" dependency is a direct or transitive dependency of "$original_package_dir"
@@ -247,15 +247,15 @@ pkg.phase-local-integration() {
 		ensure.dir "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id"
 		if [ -f "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id/basalt.toml" ]; then
 			if util.get_toml_array "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id/basalt.toml" 'dependencies'; then
-				pkg.phase-local-integration "$original_package_dir" 'no' 'strict' "${REPLIES[@]}"
+				pkg.phase_local-integration "$original_package_dir" 'no' 'strict' "${REPLIES[@]}"
 			fi
 		fi
 	done
 	unset pkg
 }
 
 # @description Generate scripts for './.basalt/generated' directory
-pkg.phase-local-generate-scripts() {
+pkg.phase_local-generate-scripts() {
 	local project_dir="$1"
 	local mode="$2"