From d76c68505c36dbf383a989f3c2458abc765e2c19 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Mon, 3 Apr 2017 14:48:27 +0200 Subject: base-files: profile: Simplify setting variables conditionally It is preferred to use `[ "$FOO" ] || ...` instead of `[ -z "$FOO" ] && ...` as the latter leaves $? set to 1. Signed-off-by: Peter Kjellerstedt Signed-off-by: Ross Burton --- meta/recipes-core/base-files/base-files/profile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'meta/recipes-core/base-files') diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index ceaf15f799..a062028226 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -3,15 +3,13 @@ PATH="/usr/local/bin:/usr/bin:/bin" EDITOR="vi" # needed for packages like cron, git-commit -test -z "$TERM" && TERM="vt100" # Basic terminal capab. For screen etc. +[ "$TERM" ] || TERM="vt100" # Basic terminal capab. For screen etc. -if [ "$HOME" = "ROOTHOME" ]; then - PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin -fi -if [ "$PS1" ]; then - # works for bash and ash (no other shells known to be in use here) - PS1='\u@\h:\w\$ ' -fi +# Add /sbin & co to $PATH for the root user +[ "$HOME" != "ROOTHOME" ] || PATH=$PATH:/usr/local/sbin:/usr/sbin:/sbin + +# Set the prompt for bash and ash (no other shells known to be in use here) +[ -z "$PS1" ] || PS1='\u@\h:\w\$ ' if [ -d /etc/profile.d ]; then for i in /etc/profile.d/*.sh; do -- cgit 1.2.3-korg