[OE-core] [PATCHv2 3/3] base-files: profile: Simplify setting variables conditionally

[Richard Purdie]

On Wed, 2017-04-05 at 15:46 +0200, Peter Kjellerstedt wrote:
> It is preferred to use `[ <condition> ] || ...` instead of
> `[ <negated condition> ] && ...` as the latter leaves $? set to 1.

Your patch and the description above don't match. There are changes
here which aren't <negated condition> and are stylistic changes instead
afaict. We're past feature freeze so whilst I'm interested in genuine
bugs, I do not really want code churn which just introduces risk.

Cheers,

Richard

> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
> ---
>  meta/recipes-core/base-files/base-files/profile | 14 ++++++--------
>  1 file changed, 6 insertions(+), 8 deletions(-)
> 
> 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
> -- 
> 2.12.0
>