YunoHost/install_script
1
0
Fork 0
mirror of https://github.com/YunoHost/install_script.git synced 2024-09-03 20:06:25 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #49 from YunoHost/fix_locals

Browse source 
[fix] set up locals to avoid perl warnings
This commit is contained in:
Bram 2018-07-25 08:03:15 +02:00 • committed by GitHub
commit 34ee03e5ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
install_yunohost
View file

@ -90,6 +90,7 @@ function main()
step install_script_dependencies || die "Unable to install dependencies to install script" step install_script_dependencies || die "Unable to install dependencies to install script"
step create_custom_config || die "Creating custom configuration file /etc/yunohost/yunohost.conf failed" step create_custom_config || die "Creating custom configuration file /etc/yunohost/yunohost.conf failed"
step confirm_installation || die "Installation cancelled at your request" step confirm_installation || die "Installation cancelled at your request"
step fix_locales # do not die for a failure here, it's minor
step setup_package_source || die "Setting up deb package sources failed" step setup_package_source || die "Setting up deb package sources failed"
step apt_update || die "Error caught during 'apt-get update'" step apt_update || die "Error caught during 'apt-get update'"
step register_debconf || die "Unable to insert new values into debconf database" step register_debconf || die "Unable to insert new values into debconf database"
@ -402,6 +403,12 @@ function restart_services() {
return 0 return 0
} }
function fix_locales() {
[ "$(grep LC_ALL /etc/environment)" ] || echo 'LC_ALL="en_US.UTF-8"' >> /etc/environment
source /etc/environment
export LC_ALL
}
function post_install() { function post_install() {
# No postinstall in auto mode # No postinstall in auto mode
[[ "$AUTOMODE" == "1" ]] && return 0 [[ "$AUTOMODE" == "1" ]] && return 0