From e4a4fcc9fb66a5be960b05f8de21e1f8e5b018c2 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 11 May 2010 14:55:23 +0000
Subject: [PATCH] Moved definitions of the USER and GROUP environmental
 variables from SetupEnvironment to /etc/profile and use the "id" command. No
 need to set SHELL, since the shell sets it anyway. Fixes #5966.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@36788 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 data/etc/profile                  | 3 +++
 data/system/boot/SetupEnvironment | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/etc/profile b/data/etc/profile
index f3f4e6d564..c39d2a789b 100644
--- a/data/etc/profile
+++ b/data/etc/profile
@@ -5,6 +5,9 @@
 
 echo -e "\nWelcome to the Haiku shell.\n"
 
+export USER=`id -un`
+export GROUP=`id -gn`
+
 if [ -z $BE_HOST_CPU ]; then
 	. /boot/system/boot/SetupEnvironment
 fi
diff --git a/data/system/boot/SetupEnvironment b/data/system/boot/SetupEnvironment
index b7ac7f7b36..23948ba868 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -4,9 +4,6 @@
 #
 
 export HOME=/boot/home
-export SHELL=/bin/sh
-export USER=baron
-export GROUP=users
 
 BUILDHOME=/boot/develop
 BETOOLS="$BUILDHOME/tools/gnupro/bin"