From ba8510deb73e07f17be051fa15a91731ec10382f Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Thu, 19 Jul 2018 20:19:40 +0200 Subject: base-files: profile: Avoid using "command" to determine if programs exist Since the existence of "command" in itself is not guaranteed, using it to determine if other executables exist is moot. Instead just run the executables and let the shell determine if they exist. By piping stderr to /dev/null we avoid unnecessary warnings in case they do not exist. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/profile | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'meta') diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index a062028226..e14cb2d878 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -20,14 +20,16 @@ if [ -d /etc/profile.d ]; then unset i fi -if command -v resize >/dev/null && command -v tty >/dev/null; then - # Make sure we are on a serial console (i.e. the device used starts with - # /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which - # tries do use ssh - case $(tty) in - /dev/tty[A-z]*) resize >/dev/null;; - esac -fi +# Make sure we are on a serial console (i.e. the device used starts with +# /dev/tty[A-z]), otherwise we confuse e.g. the eclipse launcher which tries do +# use ssh +case $(tty 2>/dev/null) in + # The first invocation of resize verifies that it exists, the second + # does the actual resizing. This is due to that resize uses stderr to + # determine the size of the tty, which does not work if it is redirected + # to /dev/null. + /dev/tty[A-z]*) resize >/dev/null 2>&1 && resize >/dev/null;; +esac export PATH PS1 OPIEDIR QPEDIR QTDIR EDITOR TERM -- cgit 1.2.3-korg