diff --git a/README.md b/README.md index bd2bc96..9fd978a 100644 --- a/README.md +++ b/README.md @@ -8,9 +8,6 @@ utilisé lors des Instalalis dispenséees par Libre.re TODO: ---- -* [ ] fix `tools` pathset -* [ ] miaou-bash cannot be installed after error occuring - * [ ] gnome-extensions schema compilation after error occuring * [ ] epson http://download.ebz.epson.net/dsc/search/01/search/searchModuleFromResult @@ -31,4 +28,4 @@ requirements before installation process install one-liner ----------------- -`sudo apt install -y curl git && curl https://git.artcode.re/pvincent/debian-gnome/raw/branch/master/src/install.sh | bash -s --` \ No newline at end of file +`sudo apt install -y curl git && curl https://git.artcode.re/pvincent/debian-gnome/raw/branch/main/src/install.sh | bash -s --` \ No newline at end of file diff --git a/src/trixie.sh b/src/trixie.sh index c09f02c..cc3d7bf 100755 --- a/src/trixie.sh +++ b/src/trixie.sh @@ -78,6 +78,35 @@ function apt_required_packages { done } +function fix_system_lang { + echo "# fix system language" + echo "=====================" + + if grep -q ^LANG=C.UTF-8 /etc/default/locale; then + LANG='en_US.UTF-8' + if gsettings get org.gnome.desktop.input-sources sources | grep -q "'xkb', 'fr"; then + LANG='fr_FR.UTF-8' + else + if gsettings get org.gnome.desktop.input-sources sources | grep -q "'xkb', 'es"; then + LANG='es_ES.UTF-8' + fi + fi + + echo "fix found LANG=$LANG" + + cat << EOF | sudo tee /etc/locale.gen +$LANG UTF-8 +EOF + sudo locale-gen + sudo update-locale LANG=$LANG + else + echo 'already fixed!' + fi + + source /etc/default/locale + export LANG +} + function fix_input_sources { echo "# fix input sources containing french variants" echo "==============================================" @@ -139,8 +168,6 @@ function true_firefox { echo "=================" firefox_lang=$(echo $LANG | cut -d. -f1) - [[ $firefox_lang =~ C|en|es ]] && firefox_lang="en-US" - echo "$firefox_lang" if [[ ! /usr/local/bin/firefox -ef /opt/firefox/firefox ]]; then set -e cd /tmp @@ -274,7 +301,9 @@ EOF gsettings set com.gexperts.Tilix.Settings window-style 'disable-csd-hide-toolbar' gsettings set com.gexperts.Tilix.Settings control-click-titlebar true gsettings set com.gexperts.Tilix.Settings terminal-title-show-when-single false - + gsettings set com.gexperts.Tilix.Settings warn-vte-config-issue false + gsettings set com.gexperts.Tilix.Settings theme-variant 'dark' + gsettings set com.gexperts.Tilix.Settings control-click-titlebar true } function no_lock_screen { @@ -433,6 +462,7 @@ function install_flatpak { upgrade apt_required_packages +fix_system_lang fix_input_sources miaou_bash openssh