bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

kiss: extract first

Browse Source
This commit is contained in:
Dylan Araps 2019-09-13 23:52:15 +03:00
parent 215334e989
commit 3e04556a57
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kiss
View File

@ -352,11 +352,12 @@ pkg_build() {
# Mark packages passed on the command-line # Mark packages passed on the command-line
# separately from those detected as dependencies. # separately from those detected as dependencies.
explicit="$explicit $pkg " explicit="$explicit $pkg "
explicit_build="$explicit_build $pkg "
;; ;;
esac esac
done done
explicit_build="$explicit"
# If an explicit package is a dependency of another explicit # If an explicit package is a dependency of another explicit
# package, remove it from the explicit list as it needs to be # package, remove it from the explicit list as it needs to be
# installed as a dependency. # installed as a dependency.
@ -372,8 +373,7 @@ pkg_build() {
set -- $deps $explicit set -- $deps $explicit
# The dependency solver always lists all dependencies regardless of # The dependency solver always lists all dependencies regardless of
# whether or not they are installed. Ensure that all explicit packages # whether or not they are installed. Filter out installed dependencies.
# are included and ensure that all installed packages are excluded.
for pkg; do for pkg; do
case $explicit_build in case $explicit_build in
*" $pkg "*) ;; *" $pkg "*) ;;
@ -456,11 +456,13 @@ pkg_build() {
# Die here as packages with differing checksums were found above. # Die here as packages with differing checksums were found above.
[ "$mismatch" ] && die "Checksum mismatch with: ${mismatch% }" [ "$mismatch" ] && die "Checksum mismatch with: ${mismatch% }"
# Extract all packages before build to catch any extraction
# errors early.
for pkg; do pkg_extract "$pkg"; done
# Finally build and create tarballs for all passed packages and # Finally build and create tarballs for all passed packages and
# dependencies. # dependencies.
for pkg; do for pkg; do
pkg_extract "$pkg"
repo_dir=$(pkg_find "$pkg") repo_dir=$(pkg_find "$pkg")
# Install built packages to a directory under the package name # Install built packages to a directory under the package name