hrev52260 adds 1 changeset to branch 'master'
old head: 5174b9e8d11062b1ff43ec40698014efba3b76e7
new head: bddcee2a27042b4d8d6b0142b466f30abc886648
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=bddcee2a2704+%5E5174b9e8d110
----------------------------------------------------------------------------
bddcee2a2704: data: Fix locale setup in SetupEnvironment and remove it from
etc/profile.
These changes were made to etc/profile by PulkoMandy last year, but he missed
making the change in SetupEnvironment. etc/profile calls SetupEnvironment,
so we can consolidate all this there.
Also clean up some syntax.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52260
Commit: bddcee2a27042b4d8d6b0142b466f30abc886648
URL: https://git.haiku-os.org/haiku/commit/?id=bddcee2a2704
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Tue Aug 21 21:01:53 2018 UTC
----------------------------------------------------------------------------
2 files changed, 6 insertions(+), 17 deletions(-)
data/etc/profile | 8 --------
data/system/boot/SetupEnvironment | 15 ++++++---------
----------------------------------------------------------------------------
diff --git a/data/etc/profile b/data/etc/profile
index 84e291a3be..f9de4feaf9 100644
--- a/data/etc/profile
+++ b/data/etc/profile
@@ -22,14 +22,6 @@ fi
export HISTFILESIZE=500
export HISTCONTROL=ignoredups
-# Locale
-export LC_MESSAGES=`locale --message`
-export LC_NUMERIC=`locale --format`
-export LC_TIME=`locale --time`
-export LC_COLLATE=$LC_MESSAGES
-export LC_CTYPE=$LC_MESSAGES
-export LC_MONETARY=$LC_NUMERIC
-
alias ls="ls --color=auto"
alias ll="ls -lA"
alias la="ls -A"
diff --git a/data/system/boot/SetupEnvironment
b/data/system/boot/SetupEnvironment
index d444e0b444..58974e2812 100644
--- a/data/system/boot/SetupEnvironment
+++ b/data/system/boot/SetupEnvironment
@@ -27,8 +27,7 @@ export BUILDHOME
export BEINCLUDES
export BE_HOST_CPU
-if [ "$SAFEMODE" != "yes" ]
-then
+if [ "$SAFEMODE" != "yes" ]; then
export
PATH=.:$HOME/config/non-packaged/bin:$HOME/config/bin:/boot/system/non-packaged/bin:/bin:/boot/system/apps:/boot/system/preferences
export
LIBRARY_PATH="%A/lib:$HOME/config/non-packaged/lib:$HOME/config/lib:/boot/system/non-packaged/lib:/boot/system/lib"
export
ADDON_PATH="%A/add-ons:$HOME/config/non-packaged/add-ons:$HOME/config/add-ons:/boot/system/non-packaged/add-ons:/boot/system/add-ons"
@@ -39,17 +38,15 @@ else
fi
# Locale
-export LC_MESSAGES=`locale -m`
-export LC_NUMERIC=`locale -f`
-export LC_TIME=`locale -t`
+export LC_MESSAGES=`locale --message`
+export LC_NUMERIC=`locale --format`
+export LC_TIME=`locale --time`
export LC_COLLATE=$LC_MESSAGES
export LC_CTYPE=$LC_MESSAGES
export LC_MONETARY=$LC_NUMERIC
-if [ "$SAFEMODE" != "yes" ]
-then
- if [ -f $HOME/config/settings/boot/UserSetupEnvironment ]
- then
+if [ "$SAFEMODE" != "yes" ]; then
+ if [ -f $HOME/config/settings/boot/UserSetupEnvironment ]; then
. $HOME/config/settings/boot/UserSetupEnvironment
fi
fi