@@ -34,12 +34,6 @@ pkg.install_package() {
34
34
# Only after all the dependencies are installed do we muck with the global packages
35
35
pkg.phase_global_integration " $package_id "
36
36
done ; unset pkg
37
-
38
- # TODO: make this happen only once (recursion)
39
- # Only if all the previous modifications to the global package store has been successfull
40
- # do we muck with the current local project
41
- pkg.phase_local_integration_recursive " $project_dir " ' yes' " $symlink_mode " " $@ "
42
- pkg.phase_local_integration_nonrecursive " $project_dir "
43
37
}
44
38
45
39
# @description Downloads package tarballs from the internet to the global store. If a git revision is specified, it
@@ -171,6 +165,7 @@ pkg.phase_local_integration_recursive() {
171
165
172
166
ensure.nonzero ' original_package_dir'
173
167
ensure.nonzero ' is_direct'
168
+ ensure.nonzero ' symlink_mode'
174
169
175
170
local pkg=
176
171
for pkg; do
@@ -222,11 +217,11 @@ pkg.phase_local_integration_recursive() {
222
217
# @description Generate scripts for './.basalt/generated' directory
223
218
pkg.phase_local_integration_nonrecursive () {
224
219
local project_dir=" $1 "
225
- local mode= " $2 "
220
+ ensure.nonzero ' project_dir '
226
221
227
222
# Create generated files
228
223
local content=
229
- if [ -d " $project_dir /basalt.toml" ]; then
224
+ if [ -f " $project_dir /basalt.toml" ]; then
230
225
if util.get_toml_array " $project_dir /basalt.toml" ' sourceDirs' ; then
231
226
if (( ${# REPLIES[@]} > 0 )) ; then
232
227
# TODO output to file descriptor with exec
252
247
fi
253
248
fi
254
249
fi
255
-
256
250
}
0 commit comments