Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Augustin Cavalier 2018-08-21 17:01:53 -04:00
parent 5174b9e8d1
commit bddcee2a27
2 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/etc/profile
View File

@ -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"

15
data/system/boot/SetupEnvironment
View File

@ -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