From b7a7032550c9eb25237c7ba4ea9c87fd49574bd1 Mon Sep 17 00:00:00 2001 From: Marco Vermeulen Date: Sun, 8 Aug 2021 13:03:31 +0100 Subject: [PATCH] Add paging behaviour to version list. --- src/main/bash/sdkman-list.sh | 4 ++-- src/main/bash/sdkman-utils.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/bash/sdkman-list.sh b/src/main/bash/sdkman-list.sh index e7aa2469..5624120f 100644 --- a/src/main/bash/sdkman-list.sh +++ b/src/main/bash/sdkman-list.sh @@ -30,7 +30,7 @@ function __sdkman_list_candidates() { if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then __sdkman_echo_red "This command is not available while offline." else - __sdkman_page echo "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/list")" + __sdkman_echo_paged "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/list")" fi } @@ -44,7 +44,7 @@ function __sdkman_list_versions() { if [[ "$SDKMAN_AVAILABLE" == "false" ]]; then __sdkman_offline_list "$candidate" "$versions_csv" else - __sdkman_echo_no_colour "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/${candidate}/${SDKMAN_PLATFORM}/versions/list?current=${CURRENT}&installed=${versions_csv}")" + __sdkman_echo_paged "$(__sdkman_secure_curl "${SDKMAN_CANDIDATES_API}/candidates/${candidate}/${SDKMAN_PLATFORM}/versions/list?current=${CURRENT}&installed=${versions_csv}")" fi } diff --git a/src/main/bash/sdkman-utils.sh b/src/main/bash/sdkman-utils.sh index 2a2ad76a..51797264 100644 --- a/src/main/bash/sdkman-utils.sh +++ b/src/main/bash/sdkman-utils.sh @@ -65,13 +65,13 @@ function __sdkman_secure_curl_with_timeouts() { fi } -function __sdkman_page() { +function __sdkman_echo_paged() { if [[ -n "$PAGER" ]]; then - "$@" | eval $PAGER + echo "$@" | eval "$PAGER" elif command -v less >& /dev/null; then - "$@" | less + echo "$@" | less else - "$@" + echo "$@" fi }