refactor: Cleanup loop variables

Author: hyperupcall

pkg/lib/commands/do-global-init.sh

@@ -82,8 +82,7 @@ do-global-init() {
 		if [ -d "$BASALT_GLOBAL_DATA_DIR/completions/bash" ]; then
 		  for f in "$BASALT_GLOBAL_DATA_DIR"/completions/bash/*; do
 		    source "$f"
-		  done
-		  unset f
+		  done; unset f
 		fi
 
 		EOF
@@ -104,8 +103,7 @@ do-global-init() {
 		if [ -d "$BASALT_GLOBAL_DATA_DIR/completions/zsh/compctl" ]; then
 		  for f in "$BASALT_GLOBAL_DATA_DIR"/completions/zsh/compctl/*; do
 		    source "$f"
-		  done
-		  unset f
+		  done; unset f
 		fi
 
 		EOF

pkg/lib/public/basalt-package.sh

@@ -33,11 +33,10 @@ basalt.package-load() {
 					fi
 
 					shopt -s nullglob
-				done
-			done
-		done
+				done; unset __basalt_package
+			done; unset __basalt_repository_owner
+		done; unset __basalt_site
 	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"

pkg/lib/util/pkg.sh

@@ -202,8 +202,7 @@ pkg.phase_local_integration_recursive() {
 				pkg.phase_local_integration_recursive "$original_package_dir" 'no' 'strict' "${REPLIES[@]}"
 			fi
 		fi
-	done
-	unset pkg
+	done; unset pkg
 }
 
 # @description Generate scripts for './.basalt/generated' directory
@@ -227,8 +226,7 @@ pkg.phase_local_integration_nonrecursive() {
   fi
 done
 "
-				done
-				unset source_dir
+				done; unset source_dir
 
 				printf -v content '%s%s' "$content" 'unset __basalt_f'
 

pkg/lib/util/util-temporary.sh

@@ -115,8 +115,7 @@ util.toml_add_dependency() {
 				print.indent-yellow 'Warning' "A version of '${name%@*}' is already installed. Skipping"
 				return
 			fi
-		done
-		unset name
+		done; unset name
 
 		if ((${#REPLIES[@]} == 0)); then
 			mv "$toml_file" "$toml_file.bak"
@@ -145,16 +144,15 @@ util.toml_remove_dependency() {
 
 	if util.get_toml_array "$toml_file" 'dependencies'; then
 		local dependency_array=()
-		local name=
 		local does_exist='no'
+		local name=
 		for name in "${REPLIES[@]}"; do
 			if [ "${name%@*}" = "${key_value%@*}" ]; then
 				does_exist='yes'
 			else
 				dependency_array+=("$name")
 			fi
-		done
-		unset name
+		done; unset name
 
 		if [ "$does_exist" != 'yes' ]; then
 			print.indent-die "The package '$key_value' is not currently a dependency"
@@ -165,10 +163,10 @@ util.toml_remove_dependency() {
 		while IFS= read -r line; do
 			if [[ "$line" == *dependencies*=* ]]; then
 				local new_line='dependencies = ['
+				local dep=
 				for dep in "${dependency_array[@]}"; do
 					printf -v new_line "%s'%s', " "$new_line" "$dep"
-				done
-				unset dep
+				done; unset dep
 
 				new_line="${new_line%, }]"
 				printf '%s\n' "$new_line"