Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-12-27 09:58:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use C locale for Conty itself

Browse source 
For more portability. Note this is only for Conty itself, applications that you run via Conty will use your actual locale.
This commit is contained in:
Kron4ek 2023-07-16 16:53:11 +05:00
parent b1c405c46f
commit 10af058094
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
conty-start.sh
View file

@ -5,6 +5,9 @@ LD_PRELOAD_ORIG="${LD_PRELOAD}"
LD_LIBRARY_PATH_ORIG="${LD_LIBRARY_PATH}" LD_LIBRARY_PATH_ORIG="${LD_LIBRARY_PATH}"
unset LD_PRELOAD LD_LIBRARY_PATH unset LD_PRELOAD LD_LIBRARY_PATH
LC_ALL_ORIG="${LC_ALL}"
export LC_ALL=C
msg_root=" msg_root="
Do not run this script as root! Do not run this script as root!
@ -19,7 +22,7 @@ if (( EUID == 0 )) && [ -z "$ALLOW_ROOT" ]; then
fi fi
# Conty version # Conty version
script_version="1.24.2" script_version="1.24.3"
# Important variables to manually adjust after modification! # Important variables to manually adjust after modification!
# Needed to avoid problems with mounting due to an incorrect offset. # Needed to avoid problems with mounting due to an incorrect offset.
@ -28,7 +31,7 @@ script_version="1.24.2"
# size to 0 # size to 0
init_size=50000 init_size=50000
bash_size=1490760 bash_size=1490760
script_size=37193 script_size=37320
busybox_size=1161112 busybox_size=1161112
utils_size=4327795 utils_size=4327795
@ -597,7 +600,6 @@ run_bwrap () {
unset non_standard_home unset non_standard_home
unset xsockets unset xsockets
unset mount_opt unset mount_opt
unset ld_vars
if [ -n "${WAYLAND_DISPLAY}" ]; then if [ -n "${WAYLAND_DISPLAY}" ]; then
wayland_socket="${WAYLAND_DISPLAY}" wayland_socket="${WAYLAND_DISPLAY}"
@ -741,11 +743,17 @@ run_bwrap () {
USE_SYS_UTILS XEPHYR_SIZE CUSTOM_MNT" USE_SYS_UTILS XEPHYR_SIZE CUSTOM_MNT"
for v in ${conty_variables}; do for v in ${conty_variables}; do
unset_vars+=(--unsetenv "${v}") set_vars+=(--unsetenv "${v}")
done done
[ -n "${LD_PRELOAD_ORIG}" ] && ld_vars+=(--setenv LD_PRELOAD "${LD_PRELOAD_ORIG}") [ -n "${LD_PRELOAD_ORIG}" ] && set_vars+=(--setenv LD_PRELOAD "${LD_PRELOAD_ORIG}")
[ -n "${LD_LIBRARY_PATH_ORIG}" ] && ld_vars+=(--setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH_ORIG}") [ -n "${LD_LIBRARY_PATH_ORIG}" ] && set_vars+=(--setenv LD_LIBRARY_PATH "${LD_LIBRARY_PATH_ORIG}")
if [ -n "${LC_ALL_ORIG}" ]; then
set_vars+=(--setenv LC_ALL "${LC_ALL_ORIG}")
else
set_vars+=(--unsetenv LC_ALL)
fi
show_msg show_msg
@ -775,8 +783,7 @@ run_bwrap () {
"${mount_opt[@]}" \ "${mount_opt[@]}" \
"${xsockets[@]}" \ "${xsockets[@]}" \
"${unshare_net[@]}" \ "${unshare_net[@]}" \
"${unset_vars[@]}" \ "${set_vars[@]}" \
"${ld_vars[@]}" \
--setenv PATH "${CUSTOM_PATH}" \ --setenv PATH "${CUSTOM_PATH}" \
"$@" "$@"
} }