Skip to content

Commit 79be890

Browse files
committed
refactor: pkg.install_package -> pkg.install_packages
1 parent d5ca227 commit 79be890

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

docs/internals/package-installation.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ During this stage, tarballs files are downloaded from the internet to `$BASALT_G
1616

1717
In most cases, tarballs can be downloaded directly. From the point of view of a consumer, you can access these types of tarballs by specifying a revision like `@v0.3.0'` in `dependencies`. From the point of view of a package maintainer, enable this behavior by authoring a GitHub release based on a release commit of a Git repository. Doing this is most efficient since the whole Git repository does not need to be downloaded
1818

19-
Sometimes, a package consumer may want to use a revision that is not a release (e.g. `@e5466e6c3998790ebd99768cf0f910e161b84a95`). When this type of revision is specified, Basalt will clone the entire repsitory, then use `git-archive(1)` to extract the revision in the form of a tarball
19+
Sometimes, a package consumer may want to use a revision that is not a release (e.g. `@e5466e6c3998790ebd99768cf0f910e161b84a95`). When this type of revision is specified, Basalt will clone the entire repository, then use `git-archive(1)` to extract the revision in the form of a tarball
2020

2121
## 2. Package extraction
2222

@@ -28,7 +28,7 @@ For each package in `$BASALT_GLOBAL_DATA_DIR/store/packages`, modifications are
2828

2929
- Appending version numbers to all functions
3030
- Creating a local `./.basalt` directory (local integration)
31-
- Converting the runtime essence of the `./basalt.toml` file into other files that are either sourcable or easier to parse
31+
- Converting the runtime essence of the `./basalt.toml` file into other files that are either sourceable or easier to parse
3232

3333
### 4. Local integration (recursive)
3434

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ do-global-install() {
2121
dependencies+=("$dep")
2222
done < "$BASALT_GLOBAL_DATA_DIR/global/dependencies"; unset dep
2323

24-
pkg.install_package "$BASALT_GLOBAL_DATA_DIR/global" 'lenient' "${dependencies[@]}"
24+
pkg.install_packages "$BASALT_GLOBAL_DATA_DIR/global" 'lenient' "${dependencies[@]}"
2525
pkg.phase_local_integration_recursive "$BASALT_GLOBAL_DATA_DIR/global" 'yes' 'strict' "${dependencies[@]}"
2626
pkg.phase_local_integration_nonrecursive "$BASALT_GLOBAL_DATA_DIR/global"
2727
}

pkg/lib/commands/do-install.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ do-install() {
1414
# 'basalt.toml' is guaranteed to exist due to 'util.init_local'
1515
if util.get_toml_array "$BASALT_LOCAL_PROJECT_DIR/basalt.toml" 'dependencies'; then
1616
local -a dependencies=("${REPLIES[@]}")
17-
pkg.install_package "$BASALT_LOCAL_PROJECT_DIR" 'strict' "${dependencies[@]}"
17+
pkg.install_packages "$BASALT_LOCAL_PROJECT_DIR" 'strict' "${dependencies[@]}"
1818
pkg.phase_local_integration_recursive "$BASALT_LOCAL_PROJECT_DIR" 'yes' 'strict' "${dependencies[@]}"
1919
fi
2020
pkg.phase_local_integration_nonrecursive "$BASALT_LOCAL_PROJECT_DIR"

pkg/lib/util/pkg.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# @description Installs a pacakge and all its dependencies, relative to a
44
# particular project_dir. symlink_mode changes how components of its direct
55
# dependencies are synced
6-
pkg.install_package() {
6+
pkg.install_packages() {
77
local project_dir="$1"
88
local symlink_mode="$2"
99
shift 2
@@ -27,7 +27,7 @@ pkg.install_package() {
2727
# Install transitive dependencies if they exist
2828
if [ -f "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id/basalt.toml" ]; then
2929
if util.get_toml_array "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id/basalt.toml" 'dependencies'; then
30-
pkg.install_package "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id" 'strict' "${REPLIES[@]}"
30+
pkg.install_packages "$BASALT_GLOBAL_DATA_DIR/store/packages/$package_id" 'strict' "${REPLIES[@]}"
3131
fi
3232
fi
3333

0 commit comments

Comments
 (0)