From e3192d58c5f8a8651c61459aab35a27e8e4c28d1 Mon Sep 17 00:00:00 2001 From: Joshua Bussdieker Date: Wed, 29 Feb 2012 20:40:54 -0800 Subject: [PATCH 1/2] Fix tabs --- scripts/pkg-list | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/scripts/pkg-list b/scripts/pkg-list index 924318a..5579c0c 100755 --- a/scripts/pkg-list +++ b/scripts/pkg-list @@ -7,27 +7,27 @@ echo package_folder=$GVM_ROOT/pkgsets/$gvm_go_name/$gvm_pkgset_name for package in $package_folder/pkg.gvm/*; do - if [ $package == "$package_folder/pkg.gvm/*" ]; then - break - fi - package_name=`echo $package | awk '{ n=split($1,path,"/"); print path[n] }'` - output=$package_name" (" - first=true - for version in $package/*; do - version=`echo $version | awk '{ n=split($1,path,"/"); print path[n] }'` - if [ "$version" != "current" ]; then - if [ $first == true ]; then - first=false - else - output=$output", " - fi - version=`echo $version | awk '{ n=split($1,path,"/"); print path[n] }'` - output=$output$version - fi - done - output=$output")" + if [ $package == "$package_folder/pkg.gvm/*" ]; then + break + fi + package_name=`echo $package | awk '{ n=split($1,path,"/"); print path[n] }'` + output=$package_name" (" + first=true + for version in $package/*; do + version=`echo $version | awk '{ n=split($1,path,"/"); print path[n] }'` + if [ "$version" != "current" ]; then + if [ $first == true ]; then + first=false + else + output=$output", " + fi + version=`echo $version | awk '{ n=split($1,path,"/"); print path[n] }'` + output=$output$version + fi + done + output=$output")" - echo $output + echo $output done if [ -f $package_folder/goinstall.log ]; then echo From e1c6da6bc9272802f292a8f2e7bae40b6170b16e Mon Sep 17 00:00:00 2001 From: Joshua Bussdieker Date: Wed, 29 Feb 2012 21:32:15 -0800 Subject: [PATCH 2/2] Use display message for gvm pkg list --- scripts/pkg-list | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/pkg-list b/scripts/pkg-list index 5579c0c..ec3e8c5 100755 --- a/scripts/pkg-list +++ b/scripts/pkg-list @@ -1,8 +1,8 @@ #!/bin/bash . $GVM_ROOT/scripts/functions -echo " -gvm packages $gvm_go_name@$gvm_pkgset_name" +echo +display_message "gvm packages $gvm_go_name@$gvm_pkgset_name" echo package_folder=$GVM_ROOT/pkgsets/$gvm_go_name/$gvm_pkgset_name @@ -31,7 +31,7 @@ for package in $package_folder/pkg.gvm/*; do done if [ -f $package_folder/goinstall.log ]; then echo - echo "Installing via goinstall" + display_message "Installing via goinstall" echo cat $package_folder/goinstall.log fi