From 1bba4609d7690fedbfb0eb17dc8f0cf404654c25 Mon Sep 17 00:00:00 2001 From: Yaroslav Shmelev Date: Mon, 28 May 2018 06:39:45 +0700 Subject: [PATCH] sbopkg: Show version when using -g in command line. Signed-off-by: Willy Sudiarto Raharjo --- src/usr/doc/THANKS | 3 ++- src/usr/sbin/sbopkg | 8 ++++++-- tools/ChangeLog-latest.txt | 5 +++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/usr/doc/THANKS b/src/usr/doc/THANKS index 4380d2d..92cb517 100644 --- a/src/usr/doc/THANKS +++ b/src/usr/doc/THANKS @@ -94,4 +94,5 @@ We moved to github, so revision number no longer used Erich Ritz arcctgx orbea - GregT \ No newline at end of file + GregT + Yaroslav Shmelev diff --git a/src/usr/sbin/sbopkg b/src/usr/sbin/sbopkg index 2924b76..47aca01 100755 --- a/src/usr/sbin/sbopkg +++ b/src/usr/sbin/sbopkg @@ -2537,9 +2537,10 @@ gen_search_package() { local ITEM_SELECTION=$SBOPKGTMP/sbopkg_item_selection local SEARCH_CHOICE=$SBOPKGTMP/sbopkg_search_choice local SEARCH_RESULTS=$SBOPKGTMP/sbopkg_search_results + local RESULTS_VERSIONS=$SBOPKGTMP/sbopkg_search_results_versions local RESULTS=$(find -mindepth 2 -maxdepth 2 -type d \ -iwholename "./$CATEGORY/*$PKG*" -printf "%P\n" | sort) - local NAME DESC CHOICE + local NAME DESC CHOICE RESULT_VERSION local SRCHPICK SRCHCAT SRCHPKG if [[ $RESULTS ]]; then @@ -2595,9 +2596,12 @@ gen_search_package() { done else echo "Found the following matches for $PKG:" + echo -e "NAME\tVERSION" >> $RESULTS_VERSIONS for i in $RESULTS; do - echo $i + RESULT_VERSION=$(grep ^VERSION $(find $i -name *.info) | cut -d= -f2 | tr -d \") + echo -e "$i\t$RESULT_VERSION" >> $RESULTS_VERSIONS done + column -t $RESULTS_VERSIONS fi else if [[ $DIAG ]]; then diff --git a/tools/ChangeLog-latest.txt b/tools/ChangeLog-latest.txt index 9885968..9ac1d17 100644 --- a/tools/ChangeLog-latest.txt +++ b/tools/ChangeLog-latest.txt @@ -1,6 +1,6 @@ SBOPKG NEWS -sbopkg-dev (2018-05-22 11:50:50 UTC) +sbopkg-dev (2018-05-27 23:38:40 UTC) FEATURES * sqg: Parallelize building of single and all packages by option -j. Patch by Marcel Saegebarth. @@ -20,7 +20,8 @@ sbopkg-dev (2018-05-22 11:50:50 UTC) * sbopkg: Added new option in sbopkg.conf: BLACKLISTFILE This is used to define blacklisted package(s) Feature Request by khronosschoty - + * sbopkg: Show version when using -g in command line + Patch by Yaroslav Shmelev. MODIFICATIONS * bash-completion: Complete -i and -b when git repo is used