fix: Small changes

Author: hyperupcall

README.md

@@ -54,4 +54,4 @@ There is a small, but growing number of packages installable with Basalt. See th
 
 ## License
 
-Original code is licensed under MIT by Juan Ibiapina. Modifications are licensed under BSD 3-Clause by Edwin Kofler
+Original code is licensed under `MIT` by Juan Ibiapina. Modifications are licensed under `BSD-3-Clause` by Edwin Kofler

pkg/lib/public/basalt-package.sh

@@ -18,27 +18,29 @@ basalt.package-load() {
 	shopt -s nullglob
 
 	local __basalt_site= __basalt_repository_owner=  __basalt_package=
-	for __basalt_site in "$BASALT_PACKAGE_PATH"/.basalt/packages/*; do
-		for __basalt_repository_owner in "$__basalt_site"/*; do
-			for __basalt_package in "$__basalt_repository_owner"/*; do
-				if [ "$__basalt_shopt_nullglob" = 'yes' ]; then
-					shopt -s nullglob
-				else
-					shopt -u nullglob
-				fi
-
-				if [ -f "$__basalt_package/.basalt/generated/source-package.sh" ]; then
-					source "$__basalt_package/.basalt/generated/source-package.sh"
-				fi
+	if [ -d "$BASALT_PACKAGE_PATH"/.basalt/packages ]; then
+		for __basalt_site in "$BASALT_PACKAGE_PATH"/.basalt/packages/*/; do
+			for __basalt_repository_owner in "$__basalt_site"/*/; do
+				for __basalt_package in "$__basalt_repository_owner"/*/; do
+					if [ "$__basalt_shopt_nullglob" = 'yes' ]; then
+						shopt -s nullglob
+					else
+						shopt -u nullglob
+					fi
+
+					if [ -f "$__basalt_package.basalt/generated/source_package.sh" ]; then
+						source "$__basalt_package.basalt/generated/source_package.sh"
+					fi
 
-				shopt -s nullglob
+					shopt -s nullglob
+				done
 			done
 		done
-	done
+	fi
 	unset __basalt_site __basalt_repository_owner __basalt_package
 
-	if [ -f "$BASALT_PACKAGE_PATH/.basalt/generated/source-package.sh" ]; then
-		source "$BASALT_PACKAGE_PATH/.basalt/generated/source-package.sh"
+	if [ -f "$BASALT_PACKAGE_PATH/.basalt/generated/source_package.sh" ]; then
+		source "$BASALT_PACKAGE_PATH/.basalt/generated/source_package.sh"
 	fi
 
 	if [ "$__basalt_shopt_nullglob" = 'yes' ]; then

pkg/lib/util/pkg.sh

@@ -52,14 +52,14 @@ 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
@@ -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"
 
@@ -269,8 +269,11 @@ pkg.phase_local-generate-scripts() {
 			for source_dir in "${REPLIES[@]}"; do
 				# TODO: use BASALT_GLOBAL_DATA_DIR
 				printf -v content '%s%s\n' "$content" "for __basalt_f in \"$project_dir/$source_dir\"/*; do
-  source \"\$__basalt_f\"
-done"
+	if [ -f \"\$__basalt_f\" ]; then
+		source \"\$__basalt_f\"
+	fi
+done
+"
 			done
 			unset source_dir
 

tests/pkg-phase-download-tarball.bats

@@ -1 +1,9 @@
 # shellcheck shell=bash
+
+load './util/init.sh'
+
+@test "Fails for invalid repository" {
+	skip
+
+	pkg.phase_download_tarball 'remote' 'https://github.com/hyperupcall/bash-object.git' 'github.com' 'hyperupcall/bash-object' 'v0.3.0'
+}