From e7c934167ebc3f48019886610c36e0cb7b9860ec Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sat, 12 Sep 2020 18:04:30 +0300 Subject: [PATCH] kiss: cleanup update code --- kiss | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kiss b/kiss index 38e6657..bd5ef88 100755 --- a/kiss +++ b/kiss @@ -1251,11 +1251,14 @@ pkg_updates() { # Create a list of all repositories. # See [1] at top of script. # shellcheck disable=2046,2086 - { IFS=:; set -- $KISS_PATH; unset IFS; } + { + IFS=: + set -- $KISS_PATH + unset IFS + } # Update each repository in '$KISS_PATH'. for repo do - # Go to the root of the repository (if it exists). cd "$repo" case $(git remote 2>/dev/null) in @@ -1265,12 +1268,9 @@ pkg_updates() { ;; *) - # Go to the repository's root directory. cd "$(git rev-parse --show-toplevel)" - - # Go to the real root directory if this is a submodule. git_root=$(git rev-parse --show-superproject-working-tree) - cd "${git_root:-"$PWD"}" + cd "${git_root:-.}" contains "$repos" "$PWD" || { repos="$repos $PWD " @@ -1343,7 +1343,7 @@ pkg_updates() { # Compare installed packages to repository packages. [ "$db_ver-$db_rel" = "$re_ver-$re_rel" ] || { - printf '%s\n' "${pkg##*/} $db_ver-$db_rel ==> $re_ver-$re_rel" + printf '%s\n' "${pkg##*/} $db_ver-$db_rel -> $re_ver-$re_rel" set -- "$@" "${pkg##*/}" } done