summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Amelkin <a.amelkin@yadro.com>2019-07-17 18:11:32 +0300
committerEd Tanous <ed@tanous.net>2019-08-20 18:56:17 +0300
commit1f84b1ad26fcd29e17a6f491de267aef79cafd42 (patch)
treece743b4cb569d5ab5a07581330b4493e0cee7b23
parenta581189ec57b5b190c4e15e2b6228070d0ba11c7 (diff)
downloadopenbmc-1f84b1ad26fcd29e17a6f491de267aef79cafd42.tar.xz
Make `setup` show available targets in columns
The list of targets is getting longer and tends to not fit into one screen when displayed in one column. Filter it through `column` tool if available. If not available, then fall back to the old representation. Change-Id: I1e827d0835608d2e37ca58705e77a14b0667b170 Signed-off-by: Alexander Amelkin <a.amelkin@yadro.com>
-rwxr-xr-xsetup9
1 files changed, 8 insertions, 1 deletions
diff --git a/setup b/setup
index fb06ba629..d018c9814 100755
--- a/setup
+++ b/setup
@@ -21,6 +21,13 @@ if [ "$(basename -- "$0")" = "setup" ]; then
exit 1
fi
+# Check if 'column' command is present
+COLUMN=`which column`
+if [ -z "$COLUMN" ]; then
+ # If it is not, use 'cat'
+ COLUMN=`which cat`
+fi
+
machine() {
local target=$1
local build_dir=$2
@@ -54,7 +61,7 @@ machine() {
if [ -z "$1" ]; then
echo Target machine must be specified. Use one of:
echo
- (echo qemuarm; machine) | sort
+ (echo qemuarm; machine) | sort | $COLUMN
elif [ "$1" = "qemuarm" ]; then
source openbmc-env
else