secours-catholique

git clone git://bebou.netlib.re/secours-catholique
Log | Files | Refs |

commit d7fcfa14b4bb2db539051983128e248e682fc859
parent f28bdd3897ff424032a046436611cfee58b0c23f
Auteurice: Arthur Pons <arthur.pons@unistra.fr>
Date:   Thu, 13 Feb 2025 10:54:04 +0100

Passage de la conf du clavier vers .xsessionrc

Parce que pas possible de le faire depuis root sans avoir un X11 lancé.
La question est donc, est-ce que le X11 est lancé lorsque xsessionrc est
lu ? J'ai des doutes.

Diffstat:
M
makeconf
 | 
19
++++++-------------
M
makeuserfile
 | 
3
++-

2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/makeconf b/makeconf
@@ -43,19 +43,12 @@ grep -q "^indicators" /etc/lightdm/lightdm-gtk-greeter.conf \
 
 printf "Edition des fichiers des comptes (ne sert à rien ? :( )\n"
 dir="/var/lib/AccountsService"
-printf "ar_sd	ar_SD.UTF8	icon.sudan.png	$dir
-ar_sy	ar_SY.UTF8	icon.syria.png	$dir
-ps_af	ps_AF.UTF8	icon.afghanistan.png	$dir
-fa_ir	fa_IR.UTF8	icon.iran.png	$dir
-france	fr_FR.UTF8	icon.france.png	$dir
-uk	en_GB.UTF8	icon.uk.png	$dir" | xargs -n4 sudo ./makeuserfile
-
-runuser -u "ar_sd_لهجة-سودانية" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['ara','gb','fr']
-runuser -u "ar_sy_لهجات-سوريا" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['ara','gb','fr']
-runuser -u "ps_af_پښتو" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['af\tps','ara','gb','fr']
-runuser -u "fa_ir_فارسی" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['ir','ara','gb','fr']
-runuser -u "france" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['fr','gb','ara']
-runuser -u "uk" -- dconf write /org/gnome/libgnomekbd/keyboard/layouts ['gp','ara','fr']
+printf "ar_sd	ar_SD.UTF8	['ara','gb','fr']	$dir
+ar_sy	ar_SY.UTF8	['ara','gb','fr']	$dir
+ps_af	ps_AF.UTF8	['af\tps','gb','fr','ara']	$dir
+fa_ir	fa_IR.UTF8	['ir','ara','gb','fr']	$dir
+france	fr_FR.UTF8	['fr','gb','ara']	$dir
+uk	en_GB.UTF8	['gb','fr','ara','ir']	$dir" | xargs -n4 sudo ./makeuserfile
 
 printf "arrivé à la fin, reboot ? (O/n) "
 read c
diff --git a/makeuserfile b/makeuserfile
@@ -2,7 +2,7 @@
 
 set -e
 
-name="$1";locale="$2";icon="$3";dir="$4"
+name="$1";locale="$2";layout="$3";dir="$4"
 homefolder=$(find /home -mindepth 1 -maxdepth 1 -type d | grep "$name")
 
 <<-. cat > "$dir/users/$name"
@@ -21,4 +21,5 @@ SystemAccount=false
 LC_ALL=$locale
 export GDM_LANG=$locale
 export LANG=$locale
+dconf write /org/gnome/libgnomekbd/keyboard/layouts "$layout"
 .