Skip to content

Commit

Permalink
Build packages the same way in update and build
Browse files Browse the repository at this point in the history
The call to pkg_order that `kiss update` solely had is now shared with
`kiss build`. Now the dependency ordering is the same for both.

Closes #30
  • Loading branch information
TAAPArthur committed Jul 2, 2021
1 parent 8b0ad92 commit cd12536
Showing 1 changed file with 9 additions and 7 deletions.
16 changes: 9 additions & 7 deletions kiss
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,12 @@ pkg_tar() (
run_hook post-package "$1"
)

pkg_build_all() {
pkg_order "$@"
# shellcheck disable=2086
pkg_build $order
}

pkg_build() {
# Build packages and turn them into packaged tarballs.

Expand Down Expand Up @@ -1429,12 +1435,8 @@ pkg_updates() {

# Build all packages requiring an update.
# See [1] at top of script.
# shellcheck disable=2046,2086
{
pkg_update=1
pkg_order "$@"
pkg_build $order
}
pkg_update=1
pkg_build_all "$@"

log "Updated all packages"
}
Expand Down Expand Up @@ -1554,7 +1556,7 @@ args() {
esac
;;

b|build) pkg_build "${@:?No packages installed}" ;;
b|build) pkg_build_all "${@:?No packages installed}" ;;
d|download) for pkg do pkg_sources "$pkg"; done ;;
l|list) pkg_list "$@" ;;
u|update) pkg_updates ;;
Expand Down

0 comments on commit cd12536

Please sign in to comment.