From 4c43245e0b989fa85fe57090a1a584d6e6650546 Mon Sep 17 00:00:00 2001 From: Duncaen Date: Sun, 18 Apr 2021 16:54:42 +0200 Subject: [PATCH] xbps-src: add update-local and show-local-updates --- common/xbps-src/shutils/bulk.sh | 21 ++++++++++++++------- xbps-src | 16 ++++++++++++++-- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh index c0228f10ac2..b0c39b2b739 100644 --- a/common/xbps-src/shutils/bulk.sh +++ b/common/xbps-src/shutils/bulk.sh @@ -54,7 +54,7 @@ bulk_sortdeps() { } bulk_build() { - local sys="$1" + local cmd="$1" local NPROCS=$(($(nproc)*2)) local NRUNNING=0 @@ -67,10 +67,17 @@ bulk_build() { fi # Compare installed pkg versions vs srcpkgs - if [[ $sys ]]; then - bulk_sortdeps $(xbps-checkvers -f '%n' -I -D $XBPS_DISTDIR) + case "$cmd" in + installed) + bulk_sortdeps $(xbps-checkvers -f '%n' -I -D "$XBPS_DISTDIR") return $? - fi + ;; + local) + bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR") + return $? + ;; + esac + # compare repo pkg versions vs srcpkgs for f in $(xbps-checkvers -f '%n' -D $XBPS_DISTDIR); do if [ $NRUNNING -eq $NPROCS ]; then @@ -90,9 +97,9 @@ bulk_build() { } bulk_update() { - local args="$1" pkgs f rval + local cmd="$1" pkgs f rval - pkgs="$(bulk_build ${args})" + pkgs="$(bulk_build "${cmd}")" [[ -z $pkgs ]] && return 0 msg_normal "xbps-src: the following packages must be rebuilt and updated:\n" @@ -112,7 +119,7 @@ bulk_update() { msg_error "xbps-src: failed to build $pkgver pkg!\n" fi done - if [ -n "$pkgs" -a -n "$args" ]; then + if [ -n "$pkgs" -a "$cmd" == installed ]; then echo msg_normal "xbps-src: updating your system, confirm to proceed...\n" ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1 diff --git a/xbps-src b/xbps-src index f93f5c5827f..47681826196 100755 --- a/xbps-src +++ b/xbps-src @@ -122,6 +122,9 @@ show-repo-updates show-sys-updates Prints the list of outdated packages in your system. +show-local-updates + Prints the list of outdated packages in your local repositories. + sort-dependencies ... Given a list of packages specified as additional arguments, a sorted dependency list will be returned to stdout. @@ -132,6 +135,9 @@ update-bulk update-sys Rebuilds all packages in your system that are outdated and updates them. +update-local + Rebuilds all packages in your local repositories that are outdated. + update-check Check upstream site of for new releases. @@ -961,7 +967,10 @@ case "$XBPS_TARGET" in bulk_build ;; show-sys-updates) - bulk_build -I + bulk_build installed + ;; + show-local-updates) + bulk_build local ;; sort-dependencies) bulk_sortdeps ${@/$XBPS_TARGET/} @@ -970,7 +979,10 @@ case "$XBPS_TARGET" in bulk_update ;; update-sys) - bulk_update -I + bulk_update installed + ;; + update-local) + bulk_update local ;; update-check) read_pkg ignore-problems