Skip to content

Commit 0e256a8

Browse files
authored
Merge pull request #1905 from larsewi/cache-pkg
Removed bad quoting preventing word splitting
2 parents 1272158 + df48086 commit 0e256a8

File tree

1 file changed

+12
-6
lines changed

1 file changed

+12
-6
lines changed

build-scripts/install-dependencies

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,18 @@ for dep in $DEPS; do
202202
fi
203203

204204
# CACHE the newly built package
205+
log_debug "Caching package $dep..."
205206
# shellcheck disable=SC2086
206-
log_debug Caching package $dep...
207-
pkg-cache putpkg "$dep-$version" "$package_files"
207+
# > Double quote to prevent globbing and word splitting.
208+
# We want word splitting
209+
pkg-cache putpkg "$dep-$version" $package_files
208210

209211
# CLEAN UP
212+
log_debug "Removing package files for $dep..."
210213
# shellcheck disable=SC2086
211-
log_debug Removing package files for $dep...
212-
rm -f "$package_files"
214+
# > Double quote to prevent globbing and word splitting.
215+
# We want word splitting
216+
rm -f $package_files
213217

214218
# Now the package should be in the local cache
215219
package_files=$(pkg-cache listpkgfiles "$dep-$version")
@@ -219,9 +223,11 @@ for dep in $DEPS; do
219223
fi
220224

221225
# INSTALL the packages
226+
log_debug "Installing package files for $dep..."
222227
# shellcheck disable=SC2086
223-
log_debug Installing package files for $dep...
224-
install_pkg_files "$package_files"
228+
# > Double quote to prevent globbing and word splitting.
229+
# We want word splitting
230+
install_pkg_files $package_files
225231

226232
# keep 50 most recent packages to preserve disk space
227233
pkg-cache keep_newest 50

0 commit comments

Comments
 (0)