kiss-community
/
kiss
mirror of https://codeberg.org/kiss-community/kiss
1
0
Fork 1
Code Issues Wiki

kiss: Minor clean up

This commit is contained in:
Dylan Araps 2020-05-16 08:10:37 +03:00
parent c666d415ba
commit 510a7c1cdb
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
kiss
View File

@ -1371,26 +1371,24 @@ pkg_updates() {
log "Checking for new package versions" log "Checking for new package versions"
set +f set +f --
for pkg in "$sys_db/"*; do for pkg in "$sys_db/"*; do
pkg_name=${pkg##*/}
# Read version and release information from the installed packages # Read version and release information from the installed packages
# and repository. # and repository.
read -r db_ver db_rel < "$pkg/version" read -r db_ver db_rel < "$pkg/version"
read -r re_ver re_rel < "$(pkg_find "$pkg_name")/version" read -r re_ver re_rel < "$(pkg_find "${pkg##*/}")/version"
# Compare installed packages to repository packages. # Compare installed packages to repository packages.
[ "$db_ver-$db_rel" != "$re_ver-$re_rel" ] && { [ "$db_ver-$db_rel" != "$re_ver-$re_rel" ] && {
printf '%s\n' "$pkg_name $db_ver-$db_rel ==> $re_ver-$re_rel" printf '%s\n' "${pkg##*/} $db_ver-$db_rel ==> $re_ver-$re_rel"
outdated="$outdated$pkg_name " set -- "$@" "${pkg##*/}"
} }
done done
set -f set -f
contains "$outdated" kiss && { contains "$*" kiss && {
log "Detected package manager update" log "Detected package manager update"
log "The package manager will be updated first" log "The package manager will be updated first"
@ -1405,19 +1403,19 @@ pkg_updates() {
exit 0 exit 0
} }
[ "$outdated" ] || { [ "$1" ] || {
log "Everything is up to date" log "Everything is up to date"
return return
} }
log "Packages to update: ${outdated% }" log "Packages to update: $*"
# Build all packages requiring an update. # Build all packages requiring an update.
# See [1] at top of script. # See [1] at top of script.
# shellcheck disable=2046,2086 # shellcheck disable=2046,2086
{ {
pkg_update=1 pkg_update=1
pkg_order $outdated pkg_order "$@"
pkg_build $order pkg_build $order
} }
@ -1459,10 +1457,9 @@ args() {
# #
# This handles the globbing characters '*', '!', '[' and ']' as per: # This handles the globbing characters '*', '!', '[' and ']' as per:
# https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html # https://pubs.opengroup.org/onlinepubs/009695399/utilities/xcu_chap02.html
[ "${action##[as]*}" ] && [ "${action##[as]*}" ] && case "$*" in *\**|*\!*|*\[*|*\]*)
case "$*" in *\**|*\!*|*\[*|*\]*) die "Arguments contain invalid characters: '!*[]' ($*)"
die "Arguments contain invalid characters: '!*[]' ($*)" esac
esac
# Parse some arguments earlier to remove the need to duplicate code. # Parse some arguments earlier to remove the need to duplicate code.
case $action in case $action in