|
45 | 45 | cd /.cdrom/jack
|
46 | 46 | find . -print | cpio -pmud /jack
|
47 | 47 |
|
48 |
| - if [ -x /usr/bin/mate-session ]; then |
49 |
| - # Switch to Mate by default if it's present |
50 |
| - printf '[Desktop]\n' > /jack/.dmrc |
51 |
| - printf 'Session=mate\n' >> /jack/.dmrc |
52 |
| - |
53 |
| - # Set language |
54 |
| - RC_LANG="en_US.UTF-8" |
55 |
| - if [ -f /etc/sysconfig/language ]; then |
56 |
| - . /etc/sysconfig/language |
57 |
| - fi |
58 |
| - printf 'Language=%s\n' "${RC_LANG}" >> /jack/.dmrc |
59 |
| - |
60 |
| - # Set keyboard layout |
61 |
| - layout=${RC_LANG:0:2} |
62 |
| - if [ "$layout" != "en" -a "$layout" != "C" ]; then |
63 |
| - DCONF_CONFIG=/etc/dconf/db/local.d/98-xkb-settings |
64 |
| - |
65 |
| - printf "[org/mate/desktop/peripherals/keyboard/kbd]\n" > $DCONF_CONFIG |
66 |
| - printf "layouts=['us','%s']\n" "$layout" >> $DCONF_CONFIG |
67 |
| - printf "options=['grp\\\tgrp:alt_shift_toggle']\n" >> $DCONF_CONFIG |
68 |
| - printf "model='pc105'\n" >> $DCONF_CONFIG |
69 |
| - |
70 |
| - dconf update |
71 |
| - fi |
| 48 | + # Construct user .dmrc file |
| 49 | + printf '[Desktop]\n' > /jack/.dmrc |
| 50 | + printf 'Session=mate\n' >> /jack/.dmrc |
| 51 | + |
| 52 | + # Set language |
| 53 | + RC_LANG="en_US.UTF-8" |
| 54 | + if [ -f /etc/sysconfig/language ]; then |
| 55 | + . /etc/sysconfig/language |
| 56 | + fi |
| 57 | + printf 'Language=%s\n' "${RC_LANG}" >> /jack/.dmrc |
| 58 | + |
| 59 | + # Set keyboard layout |
| 60 | + layout=${RC_LANG:0:2} |
| 61 | + if [ "$layout" != "en" -a "$layout" != "C" ]; then |
| 62 | + DCONF_CONFIG=/etc/dconf/db/local.d/98-xkb-settings |
| 63 | + |
| 64 | + printf "[org/mate/desktop/peripherals/keyboard/kbd]\n" > $DCONF_CONFIG |
| 65 | + printf "layouts=['us','%s']\n" "$layout" >> $DCONF_CONFIG |
| 66 | + printf "options=['grp\\\tgrp:alt_shift_toggle']\n" >> $DCONF_CONFIG |
| 67 | + printf "model='pc105'\n" >> $DCONF_CONFIG |
| 68 | + |
| 69 | + dconf update |
72 | 70 | fi
|
73 | 71 |
|
74 | 72 | #
|
|
0 commit comments