From 363dccc65f0bc7ed75fa2eb4b9d7257b650c01c1 Mon Sep 17 00:00:00 2001 From: Alexander Amelkin Date: Mon, 5 Mar 2018 16:47:05 +0300 Subject: Refix 68a967d: setup: Fix subshell spawning * Fix subshell spawning due to `sort`. Subshell spawning effectively prevented the script from working. Now `sort` is only invoked for `setup` without arguments; * Add a license/copyright header Change-Id: I643a91cae14e5ddb8e6efe154d325baaab3d0100 Signed-off-by: Alexander Amelkin --- setup | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'setup') diff --git a/setup b/setup index 5d1242505..109c83d47 100755 --- a/setup +++ b/setup @@ -1,4 +1,20 @@ #!/bin/sh +# +# Copyright (c) 2018, YADRO +# Author: Alexander Amelkin +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# if [ "$(basename -- "$0")" = "setup" ]; then echo The script must be sourced, not executed @@ -35,9 +51,10 @@ machine() { if [ -z "$1" ]; then echo Target machine must be specified. Use one of: echo - echo qemuarm + (echo qemuarm; machine) | sort elif [ "$1" = "qemuarm" ]; then source openbmc-env +else + machine $1 fi -machine $1 | sort -- cgit v1.2.3